diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/HackResourceExtentionFilter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/HackResourceExtentionFilter.java
index c6f4799..eebadb7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/HackResourceExtentionFilter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/HackResourceExtentionFilter.java
@@ -51,7 +51,7 @@
     }
     final String version = Package.getPackage("org.apache.myfaces.tobago.component").getImplementationVersion();
     final String contextPath = filterConfig.getServletContext().getContextPath();
-    prefix = contextPath + "/tobago/standard/tobago-bootstrap/" + version + "/js/";
+    prefix = contextPath + "/tobago/standard/" + version + "/js/";
   }
 
   @Override
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/20-docker/docker.ts b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/20-docker/docker.ts
index 56bc053..5207143 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/20-docker/docker.ts
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/20-docker/docker.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import {Listener, Phase} from "../tobago/standard/tobago-bootstrap/5.0.0-SNAPSHOT/js/tobago-listener";
+import {Listener, Phase} from "../tobago/standard/5.0.0-SNAPSHOT/js/tobago-listener";
 
 module Demo.ToClipboardButton {
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/script/demo.js b/tobago-example/tobago-example-demo/src/main/webapp/script/demo.js
index 1d4336e..113ef5d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/script/demo.js
+++ b/tobago-example/tobago-example-demo/src/main/webapp/script/demo.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import {Listener, Phase} from "../tobago/standard/tobago-bootstrap/5.0.0-SNAPSHOT/js/tobago-listener";
+import {Listener, Phase} from "../tobago/standard/5.0.0-SNAPSHOT/js/tobago-listener";
 
 class Demo {
 
diff --git a/tobago-theme/pom.xml b/tobago-theme/pom.xml
index cdaea8c..a80c13a 100644
--- a/tobago-theme/pom.xml
+++ b/tobago-theme/pom.xml
@@ -52,15 +52,15 @@
       <resource>
         <directory>src/main/resources/META-INF/resources/tobago/${theme.name}</directory>
         <excludes>
-          <exclude>**/tobago-bootstrap/_version/**</exclude>
+          <exclude>**/_version/**</exclude>
         </excludes>
         <filtering>false</filtering>
         <targetPath>META-INF/resources/tobago/${theme.name}</targetPath>
       </resource>
       <resource>
-        <directory>src/main/resources/META-INF/resources/tobago/${theme.name}/tobago-bootstrap/_version</directory>
+        <directory>src/main/resources/META-INF/resources/tobago/${theme.name}/_version</directory>
         <filtering>false</filtering>
-        <targetPath>META-INF/resources/tobago/${theme.name}/tobago-bootstrap/${project.version}</targetPath>
+        <targetPath>META-INF/resources/tobago/${theme.name}/${project.version}</targetPath>
       </resource>
     </resources>
 
@@ -133,7 +133,7 @@
             </goals>
             <configuration>
               <outputDirectory>
-                ${project.build.outputDirectory}/META-INF/resources/tobago/${theme.name}/tobago-bootstrap/${project.version}
+                ${project.build.outputDirectory}/META-INF/resources/tobago/${theme.name}/${project.version}
               </outputDirectory>
               <resources>
                 <resource>
diff --git a/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml b/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml
index 68f6452..49056f7 100644
--- a/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml
+++ b/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml
@@ -36,18 +36,18 @@
       <versioned>true</versioned>
       <resources production="true">
         <includes>
-          <style name="/tobago/charlotteville/tobago-bootstrap/${project.version}/css/tobago.min.css"/>
+          <style name="/tobago/charlotteville/${project.version}/css/tobago.min.css"/>
         </includes>
         <excludes>
-          <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.min.css"/>
+          <style name="/tobago/standard/${project.version}/css/tobago.min.css"/>
         </excludes>
       </resources>
       <resources production="false">
         <includes>
-          <style name="/tobago/charlotteville/tobago-bootstrap/${project.version}/css/tobago.css"/>
+          <style name="/tobago/charlotteville/${project.version}/css/tobago.css"/>
         </includes>
         <excludes>
-          <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.css"/>
+          <style name="/tobago/standard/${project.version}/css/tobago.css"/>
         </excludes>
       </resources>
     </theme-definition>
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-Bold.otf b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/_version/fonts/Amaranth-Bold.otf
similarity index 100%
rename from tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-Bold.otf
rename to tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/_version/fonts/Amaranth-Bold.otf
Binary files differ
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-BoldItalic.otf b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/_version/fonts/Amaranth-BoldItalic.otf
similarity index 100%
rename from tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-BoldItalic.otf
rename to tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/_version/fonts/Amaranth-BoldItalic.otf
Binary files differ
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-Italic.otf b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/_version/fonts/Amaranth-Italic.otf
similarity index 100%
rename from tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-Italic.otf
rename to tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/_version/fonts/Amaranth-Italic.otf
Binary files differ
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-Regular.otf b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/_version/fonts/Amaranth-Regular.otf
similarity index 100%
rename from tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/fonts/Amaranth-Regular.otf
rename to tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/_version/fonts/Amaranth-Regular.otf
Binary files differ
diff --git a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/tobago-config.xml b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/tobago-config.xml
index 162d5a4..f50a12c 100644
--- a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/tobago-config.xml
+++ b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/tobago-config.xml
@@ -36,18 +36,18 @@
       <versioned>true</versioned>
       <resources production="true">
         <includes>
-          <style name="/tobago/roxborough/tobago-bootstrap/${project.version}/css/tobago.min.css"/>
+          <style name="/tobago/roxborough/${project.version}/css/tobago.min.css"/>
         </includes>
         <excludes>
-          <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.min.css"/>
+          <style name="/tobago/standard/${project.version}/css/tobago.min.css"/>
         </excludes>
       </resources>
       <resources production="false">
         <includes>
-          <style name="/tobago/roxborough/tobago-bootstrap/${project.version}/css/tobago.css"/>
+          <style name="/tobago/roxborough/${project.version}/css/tobago.css"/>
         </includes>
         <excludes>
-          <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.css"/>
+          <style name="/tobago/standard/${project.version}/css/tobago.css"/>
         </excludes>
       </resources>
     </theme-definition>
diff --git a/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml b/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml
index 94be12c..874ef5f 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml
+++ b/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml
@@ -36,18 +36,18 @@
       <versioned>true</versioned>
       <resources production="true">
         <includes>
-          <style name="/tobago/scarborough/tobago-bootstrap/${project.version}/css/tobago.min.css"/>
+          <style name="/tobago/scarborough/${project.version}/css/tobago.min.css"/>
         </includes>
         <excludes>
-          <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.min.css"/>
+          <style name="/tobago/standard/${project.version}/css/tobago.min.css"/>
         </excludes>
       </resources>
       <resources production="false">
         <includes>
-          <style name="/tobago/scarborough/tobago-bootstrap/${project.version}/css/tobago.css"/>
+          <style name="/tobago/scarborough/${project.version}/css/tobago.css"/>
         </includes>
         <excludes>
-          <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.css"/>
+          <style name="/tobago/standard/${project.version}/css/tobago.css"/>
         </excludes>
       </resources>
     </theme-definition>
diff --git a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml
index c0ceb71..8ca572d 100644
--- a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml
+++ b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml
@@ -36,18 +36,18 @@
       <versioned>true</versioned>
       <resources production="true">
         <includes>
-          <style name="/tobago/speyside/tobago-bootstrap/${project.version}/css/tobago.min.css"/>
+          <style name="/tobago/speyside/${project.version}/css/tobago.min.css"/>
         </includes>
         <excludes>
-          <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.min.css"/>
+          <style name="/tobago/standard/${project.version}/css/tobago.min.css"/>
         </excludes>
       </resources>
       <resources production="false">
         <includes>
-          <style name="/tobago/speyside/tobago-bootstrap/${project.version}/css/tobago.css"/>
+          <style name="/tobago/speyside/${project.version}/css/tobago.css"/>
         </includes>
         <excludes>
-          <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.css"/>
+          <style name="/tobago/standard/${project.version}/css/tobago.css"/>
         </excludes>
       </resources>
     </theme-definition>
diff --git a/tobago-theme/tobago-theme-standard/src/main/npm/package.json b/tobago-theme/tobago-theme-standard/src/main/npm/package.json
index 1878937..c4c9307 100644
--- a/tobago-theme/tobago-theme-standard/src/main/npm/package.json
+++ b/tobago-theme/tobago-theme-standard/src/main/npm/package.json
@@ -31,12 +31,12 @@
     "test": "jest",
     "dev-css": "npm-run-all --sequential dev-css-compile dev-mkdir dev-css-cp",
     "dev-css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 --include-path ../../../../../tobago-core/src/main/resources ../scss/tobago-theme.scss ../../../target/dist/css/tobago.css",
-    "dev-css-cp": "cp -R ../../../target/dist/css ../../../../../tobago-example/tobago-example-demo/target/tobago-theme-standard/META-INF/resources/tobago/standard/tobago-bootstrap/$npm_package_version",
+    "dev-css-cp": "cp -R ../../../target/dist/css ../../../../../tobago-example/tobago-example-demo/target/tobago-theme-standard/META-INF/resources/tobago/standard/$npm_package_version",
     "dev-ts": "npm-run-all --sequential dev-ts-compile dev-ts-compile-bundle dev-mkdir dev-js-cp",
     "dev-ts-compile": "tsc --project dev-tsconfig.json",
     "dev-ts-compile-bundle": "rollup --config dev-rollup.config.js",
-    "dev-js-cp": "cp -R ../../../target/dist/js ../../../../../tobago-example/tobago-example-demo/target/tobago-theme-standard/META-INF/resources/tobago/standard/tobago-bootstrap/$npm_package_version",
-    "dev-mkdir": "mkdir -p ../../../../../tobago-example/tobago-example-demo/target/tobago-theme-standard/META-INF/resources/tobago/standard/tobago-bootstrap/$npm_package_version"
+    "dev-js-cp": "cp -R ../../../target/dist/js ../../../../../tobago-example/tobago-example-demo/target/tobago-theme-standard/META-INF/resources/tobago/standard/$npm_package_version",
+    "dev-mkdir": "mkdir -p ../../../../../tobago-example/tobago-example-demo/target/tobago-theme-standard/META-INF/resources/tobago/standard/$npm_package_version"
   },
   "dependencies": {
     "@vaadin/vaadin-combo-box": "^5.0.9",
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
index 533a77e..06ebd65 100644
--- a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
@@ -41,11 +41,11 @@
           <script name="/webjars/webcomponents__custom-elements/1.2.1/custom-elements.min.js"/>
           <script name="/webjars/tether/1.4.0/js/tether.min.js"/>
           <script name="/webjars/popper.js/1.14.3/umd/popper.min.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/jsf.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-polyfill.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago.min.js"/>
+          <script name="/tobago/standard/${project.version}/js/jsf.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-polyfill.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago.min.js"/>
           <style name="/webjars/tether/1.4.0/css/tether.min.css"/>
-          <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.min.css"/>
+          <style name="/tobago/standard/${project.version}/css/tobago.min.css"/>
           <style name="/webjars/font-awesome/4.7.0/css/font-awesome.min.css"/>
         </includes>
       </resources>
@@ -54,39 +54,39 @@
           <script name="/webjars/webcomponents__custom-elements/1.2.1/externs/custom-elements.js"/>
           <script name="/webjars/tether/1.4.0/js/tether.js"/>
           <script name="/webjars/popper.js/1.14.3/umd/popper.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/jsf-development.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-polyfill.js"/>
-          <script type="module" name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-bundle.js"/>
+          <script name="/tobago/standard/${project.version}/js/jsf-development.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-polyfill.js"/>
+          <script type="module" name="/tobago/standard/${project.version}/js/tobago-bundle.js"/>
 <!--
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/ext-bootstrap.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-listener.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-core.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-dropdown.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-date.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-command.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-file.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-focus.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-header-footer.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-in.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-jsf.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-overlay.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-panel.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-popover.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-popup.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-reload.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-scroll.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-select-....js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-sheet.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-split-layout.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-stars.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-suggest.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-tab.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-tree.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-tree-listbox.js"/>
-          <script name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-utils.js"/>
+          <script name="/tobago/standard/${project.version}/js/ext-bootstrap.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-listener.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-core.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-dropdown.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-date.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-command.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-file.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-focus.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-header-footer.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-in.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-jsf.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-overlay.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-panel.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-popover.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-popup.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-reload.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-scroll.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-select-....js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-sheet.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-split-layout.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-stars.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-suggest.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-tab.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-tree.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-tree-listbox.js"/>
+          <script name="/tobago/standard/${project.version}/js/tobago-utils.js"/>
 -->
           <style name="/webjars/tether/1.4.0/css/tether.css"/>
-          <style name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.css"/>
+          <style name="/tobago/standard/${project.version}/css/tobago.css"/>
           <style name="/webjars/font-awesome/4.7.0/css/font-awesome.css"/>
         </includes>
       </resources>