diff --git a/bundles.json b/bundles.json
index 6a5864ae57..3f7c7c16f8 100644
--- a/bundles.json
+++ b/bundles.json
@@ -23,7 +23,6 @@
     "platform/features/plot",
     "platform/features/scrolling",
     "platform/features/timeline",
-    "platform/features/timeline/themes/espresso",
     "platform/forms",
     "platform/identity",
     "platform/persistence/local",
diff --git a/platform/features/timeline/bundle.json b/platform/features/timeline/bundle.json
index 4bd6c9dd7c..e44c0ca21e 100644
--- a/platform/features/timeline/bundle.json
+++ b/platform/features/timeline/bundle.json
@@ -217,6 +217,11 @@
                 }
             }
         ],
+        "stylesheets": [
+            {
+                "stylesheetUrl": "css/timeline.css"
+            }
+        ],
         "representations": [
             {
                 "key": "gantt",
diff --git a/platform/features/timeline/themes/compile-themes-sass.sh b/platform/features/timeline/res/compile-themes-sass.sh
similarity index 100%
rename from platform/features/timeline/themes/compile-themes-sass.sh
rename to platform/features/timeline/res/compile-themes-sass.sh
diff --git a/platform/features/timeline/themes/espresso/res/config.rb b/platform/features/timeline/res/config.rb
similarity index 100%
rename from platform/features/timeline/themes/espresso/res/config.rb
rename to platform/features/timeline/res/config.rb
diff --git a/platform/features/timeline/themes/espresso/res/css/timeline.css b/platform/features/timeline/res/css/timeline.css
similarity index 100%
rename from platform/features/timeline/themes/espresso/res/css/timeline.css
rename to platform/features/timeline/res/css/timeline.css
diff --git a/platform/features/timeline/themes/espresso/res/sass/_activities.scss b/platform/features/timeline/res/sass/_activities.scss
similarity index 100%
rename from platform/features/timeline/themes/espresso/res/sass/_activities.scss
rename to platform/features/timeline/res/sass/_activities.scss
diff --git a/platform/features/timeline/themes/espresso/res/sass/_constants.scss b/platform/features/timeline/res/sass/_constants.scss
similarity index 100%
rename from platform/features/timeline/themes/espresso/res/sass/_constants.scss
rename to platform/features/timeline/res/sass/_constants.scss
diff --git a/platform/features/timeline/themes/espresso/res/sass/_timelines.scss b/platform/features/timeline/res/sass/_timelines.scss
similarity index 100%
rename from platform/features/timeline/themes/espresso/res/sass/_timelines.scss
rename to platform/features/timeline/res/sass/_timelines.scss
diff --git a/platform/features/timeline/themes/espresso/res/sass/timeline.scss b/platform/features/timeline/res/sass/timeline.scss
similarity index 100%
rename from platform/features/timeline/themes/espresso/res/sass/timeline.scss
rename to platform/features/timeline/res/sass/timeline.scss
diff --git a/platform/features/timeline/themes/espresso/bundle.json b/platform/features/timeline/themes/espresso/bundle.json
deleted file mode 100644
index eef844096c..0000000000
--- a/platform/features/timeline/themes/espresso/bundle.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "name": "Timeline Styling",
-  "description": "CSS for Timelines. Ported from /warp",
-  "extensions": {
-    "stylesheets": [
-      {
-        "stylesheetUrl": "css/timeline.css",
-        "priority": "mandatory"
-      }
-    ]
-  }
-}