diff --git a/lib/jekyll-paginate-v2/autopages/pages/baseAutoPage.rb b/lib/jekyll-paginate-v2/autopages/pages/baseAutoPage.rb
index 912da48..7204380 100644
--- a/lib/jekyll-paginate-v2/autopages/pages/baseAutoPage.rb
+++ b/lib/jekyll-paginate-v2/autopages/pages/baseAutoPage.rb
@@ -7,7 +7,7 @@ def initialize(site, base, autopage_config, pagination_config, layout_name, set_
         @base = base
         @name = 'index.html'
                 
-        layout_dir = '_layouts'
+        layout_dir = site.config['layouts_dir'] || '_layouts'
 
         # Path is only used by the convertible module and accessed below when calling read_yaml
         # Handling themes stored in a gem
@@ -40,7 +40,8 @@ def initialize(site, base, autopage_config, pagination_config, layout_name, set_
         @url = File.join(permalink_formatted, @name)
         @dir = permalink_formatted
 
-        self.data['layout'] = File.basename(layout_name, File.extname(layout_name))
+        self.data['layout'] = File.join(File.dirname(layout_name),
+                                        File.basename(layout_name, '.*'))
         self.data['title'] = get_autopage_title_lambda.call( page_title )
         self.data['pagination']  = pagination_layout_config # Store the pagination configuration
 
@@ -57,4 +58,4 @@ def initialize(site, base, autopage_config, pagination_config, layout_name, set_
       end #function initialize
     end #class BaseAutoPage
   end # module PaginateV2
-end # module Jekyll
\ No newline at end of file
+end # module Jekyll