j1-template 2020.0.13 → 2020.0.18

data/lib/starter_web/_data/modules/defaults/framer.yml

@@ -267,8 +267,6 @@ defaults:
   sizeHeight:                         true
   sizeWidth:                          false
   tolerance:                          0
-  
-
 
 # ------------------------------------------------------------------------------
-# END config
+# END config

data/lib/starter_web/_data/modules/defaults/jekyll_search.yml

@@ -140,10 +140,12 @@ defaults:
                                           <div>
                                             <h4 class="result-item"> <a href="{url}" target="{target}">{title} - {tagline}</a> </h4>
                                             <p class="result-group-item-text">{excerpt}</p>
-                                            <p class="result-group-item-text small text-muted mb-3"><i class="mdi mdi-18px mdi-tag mr-2"></i>{tags}</p>
+                                            <p class="result-group-item-text small text-muted mb-3">
+                                              <i class="mdi mdi-calendar-blank mdi-18px mr-1"></i>{date}
+                                              <i class="mdi mdi-tag mdi-18px ml-2 mr-1"></i>{tags}
+                                            </p>
                                           </div>
                                         </li>
 
-
 # ------------------------------------------------------------------------------
 # END config

data/lib/starter_web/_data/modules/defaults/log4javascript.yml

@@ -34,7 +34,7 @@ defaults:
     # --------------------------------------------------------------------------
     # CONSOLE appender
     - name:                           Console Appender
-      appender:        
+      appender:
         name:                         consoleAppender
         enabled:                      true
         type:                         BrowserConsoleAppender
@@ -57,7 +57,7 @@ defaults:
 
         log_folder:                   log
         log_file_name:                messages
-        log_file_ext:                 log      
+        log_file_ext:                 log
 
         create_on_start:              true
         reset_on_start:               true
@@ -115,7 +115,7 @@ defaults:
     #     level:
     #       production:                 warn
     #       development:                debug
-    
+
     # --------------------------------------------------------------------------
     # MODULE CHILD logger (j1.module)
     # - log:
@@ -126,6 +126,5 @@ defaults:
     #       production:                 warn
     #       development:                debug
 
-
 # ------------------------------------------------------------------------------
-# END config
+# END config

data/lib/starter_web/_data/modules/defaults/log4r.yml

@@ -166,6 +166,5 @@ log4r_config:
         pattern:                        '[%X{timestamp}] [%X{id}] [%-5X{level}] [%-40X{path}] [%X{logger}] %X{message}'
         type:                           PatternFormatter
 
-
 # ------------------------------------------------------------------------------
-# END config
+# END config

data/lib/starter_web/_data/modules/defaults/navigator.yml

@@ -65,6 +65,8 @@ defaults:
   icon_color:                           mdi-grey
   icon_size:                            mdi-sm
 
+  nav_primary_color:                    "#0D47A1"                               # md-blue-900, general color for navbar and nav-menus
+
   # ----------------------------------------------------------------------------
   # NavBar
   #
@@ -84,8 +86,8 @@ defaults:
     bottom_line_height:                 1
     bottom_line_color:                  "#EEEEEE"                               # md-grey-200
     background_color_full:              rgba(0, 0, 0, 0.4)                      # rgba-darken-400
-    background_color_collapsed:         "#607D8B"                               # md-blue-grey
-    background_color_scrolled:          "#607D8B"                               # md-blue-grey
+    background_color_collapsed:         "#3F51B5"                               # md-indigo, was: md-blue-grey
+    background_color_scrolled:          "#3F51B5"                               # md-indigo, was: md-blue-grey
 
   # ----------------------------------------------------------------------------
   # NavMenu (Mobile)
@@ -116,9 +118,9 @@ defaults:
     xhr_container_id:                   navigator_nav_menu
     xhr_data_path:                      /assets/data/menu/index.html
 
-    raised_level:                       15
-    delay_menu_open:                    200
-    max_height:                         550
+    raised_level:                       15                                      # level
+    delay_menu_open:                    200                                     # milli seconds
+    max_height:                         550                                     # px
     menu_font_size:                     larger
     megamenu_font_size:                 small
     icon_family:                        MDI
@@ -132,16 +134,16 @@ defaults:
     dropdown_animate:                   false
     dropdown_animate_in:                slideInDown
     dropdown_animate_out:               fadeOutDown
-    dropdown_animate_duration:          .75
-    dropdown_item_width:                15
-    dropdown_menu_height_max:           25
+    dropdown_animate_duration:          .75                                     # seconds
+    dropdown_item_min_width:            15                                      # rem
+    dropdown_menu_max_height:           25                                      # rem
     dropdown_font_size:                 small
-    dropdown_padding_x:                 15
-    dropdown_padding_y:                 10
+    dropdown_padding_x:                 15                                      # px
+    dropdown_padding_y:                 10                                      # px
     dropdown_item_color:                "#212121"                               # md-grey-900
     dropdown_border_color:              "#3f51b5"                               # BS bg-primary
-    dropdown_border_top:                3
-    dropdown_border_radius:             0
+    dropdown_border_top:                3                                       # px
+    dropdown_border_radius:             0                                       # px
     dropdown_background_color_hover:    "#ECEFF1"                               # md-bluegrey-50
     dropdown_background_color_active:   "#CFD8DC"                               # md-bluegrey-100
 
@@ -199,12 +201,12 @@ defaults:
     icon_size:                          mdi-2x
     search_icon:                        magnify
     close_icon:                         close
-    clear_icon:                         notification-clear-all
+    clear_icon:                         filter-remove
     input_color:                        rgba(0, 0, 0, 0.7)                      # rgba-darken-700
     background_color:                   "#FAFAFA"                               # md-grey-50
     placeholder:                        QuickSearch
     search_heading_lead:                ""
     result_heading_lead:                ""
 
-# END config
 # ------------------------------------------------------------------------------
+# END config

data/lib/starter_web/_data/modules/defaults/stickybits.yml

@@ -32,6 +32,5 @@ defaults:
   useStickyClasses:                     true                                    # default: false
   verticalPosition:                     bottom
 
-
 # ------------------------------------------------------------------------------
-# END config
+# END config

data/lib/starter_web/_data/modules/defaults/themer.yml

@@ -163,6 +163,5 @@ defaults:
   includeBootswatch:                    /assets/themes/j1/core/css/theme_extensions.css
   skipIncludeBootswatch:                Uno
 
-
 # ------------------------------------------------------------------------------
-# END config
+# END config

data/lib/starter_web/_data/modules/defaults/toccer.yml

@@ -160,8 +160,7 @@ defaults:
   throttleTimeout:                      50
   scrollSmooth:                         true
   scrollSmoothDuration:                 300
-  scrollSmoothOffset:                   -90
-
+  scrollSmoothOffset:                   -90                                     # TODO: to be removed, calculated dynamically
 
 # ------------------------------------------------------------------------------
 # END config

data/lib/starter_web/_data/modules/framer.yml

@@ -47,6 +47,5 @@ settings:
   sizeWidth:                          false
   tolerance:                          0
 
-
 # ------------------------------------------------------------------------------
-# END config
+# END config

data/lib/starter_web/_data/modules/log4javascript.yml

@@ -57,7 +57,7 @@ settings:
 
         log_folder:                   log
         log_file_name:                messages
-        log_file_ext:                 log      
+        log_file_ext:                 log
 
         create_on_start:              true
         reset_on_start:               true
@@ -67,7 +67,7 @@ settings:
     # --------------------------------------------------------------------------
     # POPUP appender
     - name:                           Popup Appender
-      appender:      
+      appender:
         name:                         popupAppender
         enabled:                      false
         type:                         PopUpAppender
@@ -115,7 +115,7 @@ settings:
     #     level:
     #       production:                 warn
     #       development:                debug
-    
+
     # --------------------------------------------------------------------------
     # MODULE CHILD logger (j1.module)
     # - log:
@@ -126,6 +126,5 @@ settings:
     #       production:                 warn
     #       development:                debug
 
-
 # ------------------------------------------------------------------------------
-# END config
+# END config

data/lib/starter_web/_data/modules/log4r.yml

@@ -166,6 +166,5 @@ log4r_config:
         pattern:                        '[%X{timestamp}] [%X{id}] [%-5X{level}] [%-40X{path}] [%X{logger}] %X{message}'
         type:                           PatternFormatter
 
-
 # ------------------------------------------------------------------------------
-# END config
+# END config

data/lib/starter_web/_data/modules/navigator_menu.yml

@@ -21,10 +21,6 @@
 - item:                                 Learn
   sublevel:
 
-    - title:                            Material Design for Bootstrap
-      href:                             /pages/public/mdb_preview/
-      icon:                             face
-
     - title:                            What's up
       href:                             /pages/public/learn/whats_up/
       icon:                             alert
@@ -59,6 +55,9 @@
         - title:                        BS themes
           href:                         /pages/public/learn/roundtrip/themes/
           icon:                         face
+        - title:                        Material Design for Bootstrap
+          href:                         /pages/public/mdb_preview/
+          icon:                         face
 
     - title:                            Web in a Day
       icon:                             rocket
@@ -97,13 +96,13 @@
 - item:                                 Tools
   sublevel:
     - title:                            Gallery Previewer
-      href:                             /pages/protected/previewer/justified_gallery/
+      href:                             /pages/public/previewer/justified_gallery/
       icon:                             view-dashboard
     - title:                            MDI Icon Previewer
-      href:                             /pages/protected/previewer/mdi_font/
+      href:                             /pages/public/previewer/mdi_font/
       icon:                             incognito
     - title:                            Twitter Emoji Previewer
-      href:                             /pages/protected/previewer/twitter_emoji/
+      href:                             /pages/public/previewer/twitter_emoji/
       icon:                             sticker-emoji
     - title:                            Automagic iFrame
       href:                             /pages/public/iframer/

data/lib/starter_web/_data/modules/themer.yml

@@ -125,20 +125,20 @@ settings:
   saveToCookie:                         true
   debug:                                false
   preview_page:                         /pages/public/previewer/theme/
-# default_theme_css:                    /assets/themes/j1/core/css/uno.css
-# default_theme_name:                   Uno
-# default_theme_author:                 J1 Team
-# default_theme_link:                   https://jekyll.one/
-  menu_icon_family:                     FontAwesome
-  menu_icon_color:                      rgba_darken
-  menu_icon_size:                       large
+  default_theme_css:                    /assets/themes/j1/core/css/uno.css
+  default_theme_name:                   Uno
+  default_theme_author:                 J1 Team
+  default_theme_link:                   https://jekyll.one/
+  menu_icon_family:                     MDI
+  menu_icon_color:                      "#9E9E9E"
+  menu_icon_size:                       mdi-sm
   cssThemeLink:                         bootstrapTheme
-  defaultCssFile:                       https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.2/css/bootstrap.min.css
+  defaultCssFile:                       https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css
   bootswatchApiUrl:                     https://bootswatch.com/api
   bootswatchApiVersion:                 4
   loadFromBootswatch:                   true
   localFeed:                            /assets/data/themes.json
-  excludeBootswatch:                    default, lux, sketchy
+  excludeBootswatch:                    default,Default,Lux,Sketchy
   includeBootswatch:                    /assets/themes/j1/core/css/theme_extensions.css
   skipIncludeBootswatch:                Uno
 

data/lib/starter_web/_data/modules/toccer.yml

@@ -119,7 +119,7 @@ settings:
   throttleTimeout:                      50                                      # Timeout between firing events to make sure it's not too rapid
   scrollSmooth:                         true
   scrollSmoothDuration:                 300
-  scrollSmoothOffset:                   -80
+  scrollSmoothOffset:                   -80                                     # TODO: to be removed, calculated dynamically
 
 # ------------------------------------------------------------------------------
 # END config

data/lib/starter_web/_data/resources.yml

@@ -350,12 +350,12 @@ resources:
   #   5   log4javascript                log4javascript@1.4.15
   #   6   Bootstrap                     bootstrap@4.4.1
   #   6   bs_material_design            bootstrap-material-design@4.0.0-beta.4
-  #   7   j1_template                   j1_template_4@2020.0.13
+  #   7   j1_template                   j1_template_4@2020.0.18
   #   8   tocbot                        tocbot@4.11.2
   #   9   jekyll_search                 simple_jekyll_search@1.1.5
   #   10  bs_theme_switcher             bs_theme_switcher@1.1.5
   #   11  backstretch                   backstretch@2.1.16
-  #   12  cookie consent                cookieConsent@2019.0.0
+  #   12  cookiebar                     cookiebar@2020.0.0
   #
   # ----------------------------------------------------------------------------
   #   J1 Template Core, integrated CSS Resources
@@ -378,21 +378,34 @@ resources:
       pass_init_data:                   true
       data:
         css:                            [
+                                          core/css/uno,
                                           core/css/vendor,
-                                          core/css/globals
+                                          core/css/material-design-icons,
+                                          core/css/fontawesome
+                                        ]
+        files:                          [
+                                          modules/util/js/js.cookie.js,
+                                          modules/util/js/lite-url.js,
+                                          modules/util/js/platform.js,
+                                          modules/polyfills/js/msie.js,
+                                          adapter/js/j1.js
+                                        ]
+        js:                             [
+                                          modules/jquery/js/jquery,
+                                          modules/popper/js/popper,
+                                          modules/bootstrap/js/bootstrap,
+                                          core/js/template
                                         ]
-        files:                          [ adapter/js/j1.js ]
-        js:                             [ core/js/template ]
         init_function:                  [ j1.init ]
 
   # ----------------------------------------------------------------------------
-  # J1 MDB
+  # J1 Logger
   #
-  - name:                               Material Design Bootstrap for J1
+  - name:                               Logger
     resource:
-      id:                               mdb
+      id:                               logger
       enabled:                          true
-      comment:                          Material Design Bootstrap (MDB) for J1
+      comment:                          module logger
       region:                           head
       layout:                           [ all ]
       required:                         always
@@ -401,18 +414,21 @@ resources:
       pass_init_data:                   false
       data:
         css:                            []
-        files:                          [ adapter/js/mdb.js ]
+        files:                          [
+                                          modules/util/js/log4javascript.js,
+                                          adapter/js/logger.js
+                                        ]
         js:                             []
-        init_function:                  [ j1.adapter.mdb.init ]
+        init_function:                  [ j1.adapter.logger.init ]
 
   # ----------------------------------------------------------------------------
-  # J1 Logger
+  # Backstretch
   #
-  - name:                               J1 Logger
+  - name:                               Backstretch
     resource:
-      id:                               logger
+      id:                               backstretch
       enabled:                          true
-      comment:                          module logger
+      comment:                          Backstretch
       region:                           head
       layout:                           [ all ]
       required:                         always
@@ -421,9 +437,9 @@ resources:
       pass_init_data:                   false
       data:
         css:                            []
-        files:                          [ adapter/js/logger.js ]
-        js:                             []
-        init_function:                  [ j1.adapter.logger.init ]
+        files:                          []
+        js:                             [ modules/backstretch/js/backstretch ]
+        init_function:                  []
 
   # ----------------------------------------------------------------------------
   # Top Header
@@ -446,33 +462,58 @@ resources:
         init_function:                  [ j1.adapter.attic.init ]
 
   # ----------------------------------------------------------------------------
-  # Themer
+  # Navigator
   #
-  - name:                               J1 Themer
+  - name:                               J1 Navigator
     resource:
-      id:                               themer
+      id:                               navigator
       enabled:                          true
-      comment:                          module themer
+      comment:                          module navigator
       region:                           head
       layout:                           [ all ]
       required:                         always
-      script_load:                      defer
+      script_load:                      sync
       dependencies:                     false
       pass_init_data:                   false
       data:
         css:                            []
-        files:                          [ adapter/js/themer.js ]
+        files:                          [ adapter/js/navigator.js ]
         js:                             []
-        init_function:                  [ j1.adapter.themer.init ]
+        init_function:                  [ j1.adapter.navigator.init ]
 
   # ----------------------------------------------------------------------------
-  # Navigator
+  # MMenu Light
   #
-  - name:                               J1 Navigator
+  - name:                               Mobile Menu
     resource:
-      id:                               navigator
+      id:                               mmenu
       enabled:                          true
-      comment:                          module navigator
+      comment:                          module mmenu
+      region:                           head
+      layout:                           [ all ]
+      required:                         always
+      script_load:                      sync
+      dependencies:                     false
+      pass_init_data:                   false
+      data:
+        css:                            [
+                                          modules/mmenuLight/css/mmenu,
+                                          modules/mmenuLight/css/theme/uno
+                                        ]
+        files:                          [
+                                          modules/mmenuLight/js/mmenu.js,
+                                          adapter/js/mmenu.js ]
+        js:                             []
+        init_function:                  [ j1.adapter.mmenu.init ]
+
+  # ----------------------------------------------------------------------------
+  # Themer
+  #
+  - name:                               J1 Themer
+    resource:
+      id:                               themer
+      enabled:                          true
+      comment:                          module themer
       region:                           head
       layout:                           [ all ]
       required:                         always
@@ -481,9 +522,9 @@ resources:
       pass_init_data:                   false
       data:
         css:                            []
-        files:                          [ adapter/js/navigator.js ]
+        files:                          [ adapter/js/themer.js ]
         js:                             []
-        init_function:                  [ j1.adapter.navigator.init ]
+        init_function:                  [ j1.adapter.themer.init ]
 
   # ----------------------------------------------------------------------------
   # Toccer
@@ -496,15 +537,38 @@ resources:
       layout:                           [ page, post, collection, blog_archive ]
       region:                           head
       required:                         always
-      script_load:                      defer
+      script_load:                      sync
       dependencies:                     false
       pass_init_data:                   true
       data:
-        css:                            []
+        css:                            [
+                                          modules/tocbot/css/tocbot,
+                                          modules/tocbot/css/theme/uno
+                                        ]
         files:                          [ adapter/js/toccer.js ]
-        js:                             []
+        js:                             [ modules/tocbot/js/tocbot ]
         init_function:                  [ j1.adapter.toccer.init ]
 
+  # ----------------------------------------------------------------------------
+  # Back2Top
+  #
+  - name:                               J1 Back2Top
+    resource:
+      id:                               back2top
+      enabled:                          true
+      comment:                          module back2top
+      region:                           head
+      layout:                           [ all ]
+      required:                         ondemand
+      script_load:                      sync
+      dependencies:                     false
+      pass_init_data:                   false
+      data:
+        css:                            []
+        files:                          [ adapter/js/back2top.js ]
+        js:                             []
+        init_function:                  [ j1.adapter.back2top.init ]
+
   # ----------------------------------------------------------------------------
   # Searcher
   #
@@ -516,34 +580,34 @@ resources:
       region:                           head
       layout:                           [ all ]
       required:                         always
-      script_load:                      defer
+      script_load:                      sync
       dependencies:                     false
       pass_init_data:                   false
       data:
         css:                            []
         files:                          [ adapter/js/searcher.js ]
-        js:                             []
+        js:                             [ modules/jekyllSearch/js/simple-jekyll-search ]
         init_function:                  [ j1.adapter.searcher.init ]
 
   # ----------------------------------------------------------------------------
-  # Cookie Consent
+  # CookieBar
   #
-  - name:                               J1 Cookie Consent
+  - name:                               CookieBar
     resource:
-      id:                               cookie_consent
+      id:                               cookiebar
       enabled:                          true
-      comment:                          module cookie consent
+      comment:                          module cookiebar
       region:                           head
       layout:                           [ all ]
       required:                         always
-      script_load:                      defer
+      script_load:                      sync
       dependencies:                     false
       pass_init_data:                   false
       data:
         css:                            []
-        files:                          [ adapter/js/cookie_consent.js ]
+        files:                          [ adapter/js/cookiebar.js ]
         js:                             []
-        init_function:                  [ j1.adapter.cookie_consent.init ]
+        init_function:                  [ j1.adapter.cookiebar.init ]
 
   # ----------------------------------------------------------------------------
   # Sticky Side Menu
@@ -556,7 +620,7 @@ resources:
       region:                           head
       layout:                           [ page, post, collection, blog_archive ]
       required:                         always
-      script_load:                      defer
+      script_load:                      sync
       dependencies:                     false
       pass_init_data:                   true
       data:
@@ -576,20 +640,127 @@ resources:
       region:                           head
       layout:                           [ all ]
       required:                         always
-      script_load:                      defer
+      script_load:                      sync
       dependencies:                     false
       pass_init_data:                   false
       data:
         css:                            []
         files:                          []
-        js:                             [ extensions/jqMouseWheel/js/jquery.mousewheel ]
+        js:                             [ modules/jqMouseWheel/js/jquery.mousewheel ]
         init_function:                  []
 
+  # ----------------------------------------------------------------------------
+  # bsThemeSwitcher
+  #
+  - name:                               bsThemeSwitcher
+    resource:
+      id:                               theme_switcher
+      enabled:                          true
+      comment:                          module theme_switcher
+      region:                           head
+      layout:                           [ all ]
+      required:                         always
+      script_load:                      sync
+      dependencies:                     false
+      pass_init_data:                   false
+      data:
+        css:                            []
+        files:                          []
+        js:                             [ modules/bsThemeSwitcher/js/switcher ]
+        init_function:                  []
+
+  # ----------------------------------------------------------------------------
+  # Bootstrap Material Design (BMD)
+  #
+  - name:                               Bootstrap Material Design
+    resource:
+      id:                               bmd
+      enabled:                          true
+      comment:                          Material Design for Bootstrap
+      region:                           head
+      layout:                           [ all ]
+      required:                         always
+      script_load:                      sync
+      dependencies:                     false
+      pass_init_data:                   false
+      data:
+        css:                            []
+        files:                          [ adapter/js/mdb.js ]
+        js:                             [ modules/bmd/js/bootstrap-material-design ]
+        init_function:                  [ j1.adapter.mdb.init ]
 
 # ==============================================================================
-# J1 Core MODULES initialized 'ondemand' for a layout
+# MODULES initialized 'ondemand' for a layout
+# ------------------------------------------------------------------------------
+
+# ==============================================================================
+# Apps and Modules loaded SYCHRONOUSLY (sync)
+# ------------------------------------------------------------------------------
+
+# ==============================================================================
+# Apps and Modules loaded ASYCHRONOUSLY (defer)
 # ------------------------------------------------------------------------------
 
+  # ----------------------------------------------------------------------------
+  # Rouge
+  #
+  - name:                               Rouge Highlighter
+    resource:
+      id:                               rouge
+      enabled:                          true
+      comment:                          theme rouge
+      region:                           head
+      layout:                           [ page, post, collection ]
+      required:                         ondemand
+      script_load:                      defer
+      dependencies:                     false
+      pass_init_data:                   false
+      data:
+        css:                            []
+        files:                          [ modules/rouge/css/base16/theme.css ]
+        js:                             []
+        init_function:                  []
+
+  # ----------------------------------------------------------------------------
+  # Twitter Emoji
+  #
+  - name:                               Twemoji
+    resource:
+      id:                               twemoji
+      enabled:                          true
+      comment:                          Twemoji
+      region:                           head
+      layout:                           [ page, post, collection ]
+      required:                         ondemand
+      script_load:                      defer
+      dependencies:                     false
+      pass_init_data:                   false
+      data:
+        css:                            [ core/css/twemoji ]
+        files:                          []
+        js:                             []
+        init_function:                  []
+
+  # ----------------------------------------------------------------------------
+  # Animate CSS
+  #
+  - name:                               Animate CSS
+    resource:
+      id:                               animate
+      enabled:                          true
+      comment:                          Animate
+      region:                           head
+      layout:                           [ all ]
+      required:                         ondemand
+      script_load:                      defer
+      dependencies:                     false
+      pass_init_data:                   false
+      data:
+        css:                            [ core/css/animate ]
+        files:                          []
+        js:                             []
+        init_function:                  []
+
   # ----------------------------------------------------------------------------
   # Gallery Customizer
   #
@@ -641,23 +812,22 @@ resources:
       layout:                           [ home, page, post, collection ]
       region:                           head
       required:                         ondemand
-      script_load:                      sync
+      script_load:                      defer
       dependencies:                     false
       pass_init_data:                   true
       data:
         css:                            [
-                                          extensions/lightbox/css/lightbox,
-                                          extensions/lightbox/css/theme/uno
+                                          modules/lightbox/css/lightbox,
+                                          modules/lightbox/css/theme/uno
                                         ]
         files:                          [ adapter/js/lightbox.js ]
-        js:                             [ extensions/lightbox/js/lightbox ]
+        js:                             [ modules/lightbox/js/lightbox ]
         init_function:                  [ j1.adapter.lightbox.init ]
 
-
   # ----------------------------------------------------------------------------
-  # Lightbox V2
+  # Twitter Emoji
   #
-  - name:                               J1 Twitter Emoji Picker
+  - name:                               Twitter Emoji Picker
     resource:
       id:                               twemoji
       enabled:                          true
@@ -665,48 +835,24 @@ resources:
       layout:                           [ home, page, post, collection ]
       region:                           head
       required:                         ondemand
-      script_load:                      sync
+      script_load:                      deferred
       dependencies:                     false
       pass_init_data:                   false
       data:
         css:                            []
         files:                          []
         js:                             [
-#                                         extensions/twemoji/js/twemoji,
-                                          extensions/twemoji/js/picker/twemoji-picker
+#                                         modules/twemoji/js/twemoji,
+                                          modules/twemoji/js/picker/twemoji-picker
                                         ]
         init_function:                  []
 
-# ==============================================================================
-# Additional Apps and Modules - loaded SYCHRONOUSLY (sync)
-# ------------------------------------------------------------------------------
-
-  # ----------------------------------------------------------------------------
-  # Rouge
-  #
-  - name:                               Rouge Highlighter
-    resource:
-      id:                               rouge
-      enabled:                          true
-      comment:                          theme rouge
-      region:                           head
-      layout:                           [ page, post, collection ]
-      required:                         always
-      script_load:                      sync
-      dependencies:                     false
-      pass_init_data:                   false
-      data:
-        css:                            []
-        files:                          [ extensions/rouge/css/base16/theme.css ]
-        js:                             []
-        init_function:                  []
-
   # ----------------------------------------------------------------------------
-  # Iconify Framework API
+  # Iconify Framework
   #
-  - name:                               Iconify Framework API
+  - name:                               Iconify Framework
     resource:
-      id:                               iconify_api
+      id:                               iconify
       enabled:                          true
       comment:                          Iconify framework
       region:                           head
@@ -716,8 +862,8 @@ resources:
       dependencies:                     false
       pass_init_data:                   false
       data:
-        css:                            []
-        files:                          [ extensions/iconifyAPI/js/iconify.min.js ]
+        css:                            [ core/css/iconify-icons ]
+        files:                          [ modules/iconifyAPI/js/iconify.min.js ]
         js:                             []
         init_function:                  []
 
@@ -731,7 +877,7 @@ resources:
       region:                           head
       layout:                           [ home, page, post, collection ]
       required:                         ondemand
-      script_load:                      sync
+      script_load:                      defer
       data:
         files:                          [
                                           adapter/js/algolia.js,
@@ -741,35 +887,6 @@ resources:
                                         ]
         init_function:                  [ j1.adapter.algolia.init ]
 
-  # ----------------------------------------------------------------------------
-  # MMenu Light
-  #
-  - name:                               Mobile Menu
-    resource:
-      id:                               mmenu
-      enabled:                          true
-      comment:                          module mmenu
-      region:                           head
-      layout:                           [ all ]
-      required:                         always
-      script_load:                      sync
-      dependencies:                     false
-      pass_init_data:                   false
-      data:
-        css:                            [
-                                          extensions/mmenuLight/css/mmenu,
-                                          extensions/mmenuLight/css/theme/uno
-                                        ]
-        files:                          [
-                                          extensions/mmenuLight/js/mmenu.js,
-                                          adapter/js/mmenu.js ]
-        js:                             []
-        init_function:                  [ j1.adapter.mmenu.init ]
-
-# ==============================================================================
-# Additional Apps and Modules - loaded ASYCHRONOUSLY (defer)
-# ------------------------------------------------------------------------------
-
   # ----------------------------------------------------------------------------
   # Clipboard
   #
@@ -780,14 +897,14 @@ resources:
       comment:                          module clipboard
       region:                           head
       layout:                           [ page, post, collection ]
-      required:                         always
+      required:                         ondemand
       script_load:                      defer
       dependencies:                     false
       pass_init_data:                   false
       data:
-        css:                            [ extensions/clipboard/css/theme/uno ]
+        css:                            [ modules/clipboard/css/theme/uno ]
         files:                          [ adapter/js/clipboard.js ]
-        js:                             [ extensions/clipboard/js/clipboard ]
+        js:                             [ modules/clipboard/js/clipboard ]
         init_function:                  [ j1.adapter.clipboard.init ]
 
   # ----------------------------------------------------------------------------
@@ -807,10 +924,10 @@ resources:
       data:
         css:                            []
         files:                          [
-                                          extensions/carousel/css/carousel.css,
-                                          extensions/carousel/css/carousel_transitions.css,
-                                          extensions/carousel/css/theme/uno.css,
-                                          extensions/carousel/js/carousel.js,
+                                          modules/carousel/css/carousel.css,
+                                          modules/carousel/css/carousel_transitions.css,
+                                          modules/carousel/css/theme/uno.css,
+                                          modules/carousel/js/carousel.js,
                                           adapter/js/carousel.js
                                         ]
         js:                             []
@@ -832,11 +949,11 @@ resources:
       pass_init_data:                   true
       data:
         css:                            [
-                                          extensions/justifiedGallery/css/justifiedGallery,
-                                          extensions/justifiedGallery/css/theme/uno
+                                          modules/justifiedGallery/css/justifiedGallery,
+                                          modules/justifiedGallery/css/theme/uno
                                         ]
         files:                          [ adapter/js/jf_gallery.js ]
-        js:                             [ extensions/justifiedGallery/js/justifiedGallery ]
+        js:                             [ modules/justifiedGallery/js/justifiedGallery ]
         init_function:                  [ j1.adapter.jf_gallery.init ]
 
   # ----------------------------------------------------------------------------
@@ -855,22 +972,22 @@ resources:
       pass_init_data:                   false
       data:
         css:                            [
-                                          extensions/lightGallery/css/core/lightgallery,
-                                          extensions/lightGallery/css/core/lg-transitions,
-                                          extensions/lightGallery/css/core/lg-fb-comment-box,
-                                          extensions/lightGallery/css/themes/uno
+                                          modules/lightGallery/css/core/lightgallery,
+                                          modules/lightGallery/css/core/lg-transitions,
+                                          modules/lightGallery/css/core/lg-fb-comment-box,
+                                          modules/lightGallery/css/themes/uno
                                         ]
         files:                          []
         js:                             [
-                                          extensions/lightGallery/js/core/lightgallery,
-                                          extensions/lightGallery/js/modules/j1/j1-video,
-                                          extensions/lightGallery/js/modules/lg-autoplay,
-                                          extensions/lightGallery/js/modules/lg-fullscreen,
-                                          extensions/lightGallery/js/modules/lg-hash,
-                                          extensions/lightGallery/js/modules/lg-pager,
-                                          extensions/lightGallery/js/modules/lg-share,
-                                          extensions/lightGallery/js/modules/lg-thumbnail,
-                                          extensions/lightGallery/js/modules/lg-zoom
+                                          modules/lightGallery/js/core/lightgallery,
+                                          modules/lightGallery/js/modules/j1/j1-video,
+                                          modules/lightGallery/js/modules/lg-autoplay,
+                                          modules/lightGallery/js/modules/lg-fullscreen,
+                                          modules/lightGallery/js/modules/lg-hash,
+                                          modules/lightGallery/js/modules/lg-pager,
+                                          modules/lightGallery/js/modules/lg-share,
+                                          modules/lightGallery/js/modules/lg-thumbnail,
+                                          modules/lightGallery/js/modules/lg-zoom
                                         ]
         init_function:                  []
 
@@ -890,15 +1007,15 @@ resources:
       pass_init_data:                   false
       data:
         css:                            [
-                                          extensions/videojs/css/video-js,
-                                          extensions/videojs/css/themes/city,
-                                          extensions/videojs/css/themes/fantasy,
-                                          extensions/videojs/css/themes/forest,
-                                          extensions/videojs/css/themes/sea
+                                          modules/videojs/css/video-js,
+                                          modules/videojs/css/themes/city,
+                                          modules/videojs/css/themes/fantasy,
+                                          modules/videojs/css/themes/forest,
+                                          modules/videojs/css/themes/sea
                                         ]
         files:                          []
         js:                             [
-                                          extensions/videojs/js/video
+                                          modules/videojs/js/video
                                         ]
         init_function:                  []
 
@@ -918,7 +1035,7 @@ resources:
       pass_init_data:                   false
       data:
         css:                            []
-        files:                          [ extensions/vimeo/froogaloop/js/froogaloop2.min.js ]
+        files:                          [ modules/vimeo/froogaloop/js/froogaloop2.min.js ]
         js:                             []
         init_function:                  []
 
@@ -939,7 +1056,7 @@ resources:
       data:
         css:                            []
         files:                          []
-        js:                             [ extensions/vimeo/player/js/player ]
+        js:                             [ modules/vimeo/player/js/player ]
         init_function:                  []
 
   # ----------------------------------------------------------------------------
@@ -957,9 +1074,9 @@ resources:
       dependencies:                     false
       pass_init_data:                   false
       data:
-        css:                            [ extensions/noUISlider/css/noUISlider ]
+        css:                            [ modules/noUISlider/css/noUISlider ]
         files:                          []
-        js:                             [ extensions/noUISlider/js/noUISlider ]
+        js:                             [ modules/noUISlider/js/noUISlider ]
         init_function:                  []
 
   # ----------------------------------------------------------------------------
@@ -979,27 +1096,7 @@ resources:
       data:
         css:                            []
         files:                          []
-        js:                             [ extensions/iframeResizer/js/iframeResizer ]
-        init_function:                  []
-
-  # ----------------------------------------------------------------------------
-  # bsThemeSwitcher
-  #
-  - name:                               bsThemeSwitcher
-    resource:
-      id:                               theme_switcher
-      enabled:                          true
-      comment:                          module theme_switcher
-      region:                           head
-      layout:                           [ all ]
-      required:                         always
-      script_load:                      sync
-      dependencies:                     false
-      pass_init_data:                   false
-      data:
-        css:                            []
-        files:                          []
-        js:                             [ extensions/bsThemeSwitcher/js/switcher ]
+        js:                             [ modules/iframeResizer/js/iframeResizer ]
         init_function:                  []
 
 # ------------------------------------------------------------------------------