diff --git a/_includes/JB/pages_list b/_includes/JB/pages_list
index 181d90fb139..7856efdbc36 100644
--- a/_includes/JB/pages_list
+++ b/_includes/JB/pages_list
@@ -28,9 +28,9 @@ Usage:
       {% for cat in node.group %}
         {% if cat == group %}
           {% if page.url == node.url %}
-            <li class="active"><a href="{{ BASE_PATH }}{{node.url}}" class="active">{{node.title}}</a></li>
+            <li class="active"><a href="{{ BASE_PATH }}{{node.url}}.html" class="active">{{node.title}}</a></li>
           {% else %}
-            <li><a href="{{ BASE_PATH }}{{node.url}}">{{node.title}}</a></li>
+            <li><a href="{{ BASE_PATH }}{{node.url}}.html">{{node.title}}</a></li>
           {% endif %}
         {% endif %}
       {% endfor %}
diff --git a/_includes/JB/setup b/_includes/JB/setup
index 96a4a8d4514..2b0bf704dc5 100644
--- a/_includes/JB/setup
+++ b/_includes/JB/setup
@@ -17,7 +17,7 @@
     {% if site.JB.ASSET_PATH %}
       {% assign ASSET_PATH = site.JB.ASSET_PATH %}
     {% else %}
-      {% capture ASSET_PATH %}{{ BASE_PATH }}/assets/themes/{{ page.theme.name }}{% endcapture %}
-    {% endif %}  
+      {% capture ASSET_PATH %}{{ BASE_PATH }}/assets/themes/{% if page.theme.name %}{{ page.theme.name }}{% else if %}{{ layout.theme.name }}{% endif %}{% endcapture %}
+    {% endif %}
   {% endif %}
-{% endcapture %}{% assign jbcache = nil %}
\ No newline at end of file
+{% endcapture %}{% assign jbcache = nil %}