diff --git a/src/Consolonia.Themes/Themes/Fluent/FluentColors.axaml b/src/Consolonia.Themes/Fluent/FluentColors.axaml
similarity index 100%
rename from src/Consolonia.Themes/Themes/Fluent/FluentColors.axaml
rename to src/Consolonia.Themes/Fluent/FluentColors.axaml
diff --git a/src/Consolonia.Themes/Themes/Fluent/FluentTheme.axaml b/src/Consolonia.Themes/Fluent/FluentTheme.axaml
similarity index 75%
rename from src/Consolonia.Themes/Themes/Fluent/FluentTheme.axaml
rename to src/Consolonia.Themes/Fluent/FluentTheme.axaml
index 8fdbce60..9a9288fd 100644
--- a/src/Consolonia.Themes/Themes/Fluent/FluentTheme.axaml
+++ b/src/Consolonia.Themes/Fluent/FluentTheme.axaml
@@ -7,11 +7,11 @@
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="/Themes/Material/MaterialColors.axaml" />
+                <ResourceInclude Source="/Material/MaterialColors.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
 
     <StyleInclude Source="/Templates/Controls/AllControls.axaml" />
-    <StyleInclude Source="/Themes/TurboVisionBlack/Controls/Button.axaml" />
+    <StyleInclude Source="/TurboVisionBlack/Controls/Button.axaml" />
 </Styles>
\ No newline at end of file
diff --git a/src/Consolonia.Themes/Themes/FluentTheme.cs b/src/Consolonia.Themes/FluentTheme.cs
similarity index 100%
rename from src/Consolonia.Themes/Themes/FluentTheme.cs
rename to src/Consolonia.Themes/FluentTheme.cs
diff --git a/src/Consolonia.Themes/Themes/Material/MaterialColors.axaml b/src/Consolonia.Themes/Material/MaterialColors.axaml
similarity index 100%
rename from src/Consolonia.Themes/Themes/Material/MaterialColors.axaml
rename to src/Consolonia.Themes/Material/MaterialColors.axaml
diff --git a/src/Consolonia.Themes/Themes/Material/MaterialTheme.axaml b/src/Consolonia.Themes/Material/MaterialTheme.axaml
similarity index 73%
rename from src/Consolonia.Themes/Themes/Material/MaterialTheme.axaml
rename to src/Consolonia.Themes/Material/MaterialTheme.axaml
index 8c07004b..cc8463d9 100644
--- a/src/Consolonia.Themes/Themes/Material/MaterialTheme.axaml
+++ b/src/Consolonia.Themes/Material/MaterialTheme.axaml
@@ -4,11 +4,11 @@
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="/Themes/Material/MaterialColors.axaml" />
+                <ResourceInclude Source="/Material/MaterialColors.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
 
     <StyleInclude Source="/Templates/Controls/AllControls.axaml" />
-    <StyleInclude Source="/Themes/TurboVisionBlack/Controls/Button.axaml" />
+    <StyleInclude Source="/TurboVisionBlack/Controls/Button.axaml" />
 </Styles>
\ No newline at end of file
diff --git a/src/Consolonia.Themes/Themes/MaterialTheme.cs b/src/Consolonia.Themes/MaterialTheme.cs
similarity index 100%
rename from src/Consolonia.Themes/Themes/MaterialTheme.cs
rename to src/Consolonia.Themes/MaterialTheme.cs
diff --git a/src/Consolonia.Themes/Themes/TurboVisionBlack/Controls/Button.axaml b/src/Consolonia.Themes/TurboVisionBlack/Controls/Button.axaml
similarity index 100%
rename from src/Consolonia.Themes/Themes/TurboVisionBlack/Controls/Button.axaml
rename to src/Consolonia.Themes/TurboVisionBlack/Controls/Button.axaml
diff --git a/src/Consolonia.Themes/Themes/TurboVisionBlack/TurboVisionBlackColors.axaml b/src/Consolonia.Themes/TurboVisionBlack/TurboVisionBlackColors.axaml
similarity index 100%
rename from src/Consolonia.Themes/Themes/TurboVisionBlack/TurboVisionBlackColors.axaml
rename to src/Consolonia.Themes/TurboVisionBlack/TurboVisionBlackColors.axaml
diff --git a/src/Consolonia.Themes/Themes/TurboVisionBlack/TurboVisionBlackTheme.axaml b/src/Consolonia.Themes/TurboVisionBlack/TurboVisionBlackTheme.axaml
similarity index 71%
rename from src/Consolonia.Themes/Themes/TurboVisionBlack/TurboVisionBlackTheme.axaml
rename to src/Consolonia.Themes/TurboVisionBlack/TurboVisionBlackTheme.axaml
index 8b095a5f..6b4f103e 100644
--- a/src/Consolonia.Themes/Themes/TurboVisionBlack/TurboVisionBlackTheme.axaml
+++ b/src/Consolonia.Themes/TurboVisionBlack/TurboVisionBlackTheme.axaml
@@ -4,10 +4,10 @@
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <MergeResourceInclude Source="/Themes/TurboVisionBlack/TurboVisionBlackColors.axaml" />
+                <MergeResourceInclude Source="/TurboVisionBlack/TurboVisionBlackColors.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
     <StyleInclude Source="/Templates/Controls/AllControls.axaml" />
-    <StyleInclude Source="/Themes/TurboVisionBlack/Controls/Button.axaml" />
+    <StyleInclude Source="/TurboVisionBlack/Controls/Button.axaml" />
 </Styles>
\ No newline at end of file
diff --git a/src/Consolonia.Themes/Themes/TurboVisionBlackTheme.cs b/src/Consolonia.Themes/TurboVisionBlackTheme.cs
similarity index 100%
rename from src/Consolonia.Themes/Themes/TurboVisionBlackTheme.cs
rename to src/Consolonia.Themes/TurboVisionBlackTheme.cs
diff --git a/src/Consolonia.Themes/Themes/TurboVisionDark/Controls/Button.axaml b/src/Consolonia.Themes/TurboVisionDark/Controls/Button.axaml
similarity index 100%
rename from src/Consolonia.Themes/Themes/TurboVisionDark/Controls/Button.axaml
rename to src/Consolonia.Themes/TurboVisionDark/Controls/Button.axaml
diff --git a/src/Consolonia.Themes/Themes/TurboVisionDark/Controls/DialogWindow.axaml b/src/Consolonia.Themes/TurboVisionDark/Controls/DialogWindow.axaml
similarity index 100%
rename from src/Consolonia.Themes/Themes/TurboVisionDark/Controls/DialogWindow.axaml
rename to src/Consolonia.Themes/TurboVisionDark/Controls/DialogWindow.axaml
diff --git a/src/Consolonia.Themes/Themes/TurboVisionDark/TurboVisionDarkColors.axaml b/src/Consolonia.Themes/TurboVisionDark/TurboVisionDarkColors.axaml
similarity index 100%
rename from src/Consolonia.Themes/Themes/TurboVisionDark/TurboVisionDarkColors.axaml
rename to src/Consolonia.Themes/TurboVisionDark/TurboVisionDarkColors.axaml
diff --git a/src/Consolonia.Themes/Themes/TurboVisionDark/TurboVisionDarkTheme.axaml b/src/Consolonia.Themes/TurboVisionDark/TurboVisionDarkTheme.axaml
similarity index 63%
rename from src/Consolonia.Themes/Themes/TurboVisionDark/TurboVisionDarkTheme.axaml
rename to src/Consolonia.Themes/TurboVisionDark/TurboVisionDarkTheme.axaml
index ea7a5c6e..b4ca0109 100644
--- a/src/Consolonia.Themes/Themes/TurboVisionDark/TurboVisionDarkTheme.axaml
+++ b/src/Consolonia.Themes/TurboVisionDark/TurboVisionDarkTheme.axaml
@@ -4,12 +4,12 @@
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <MergeResourceInclude Source="/Themes/TurboVisionDark/TurboVisionDarkColors.axaml" />
+                <MergeResourceInclude Source="/TurboVisionDark/TurboVisionDarkColors.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
 
     <StyleInclude Source="/Templates/Controls/AllControls.axaml" />
-    <StyleInclude Source="/Themes/TurboVisionDark/Controls/Button.axaml" />
-    <StyleInclude Source="/Themes/TurboVisionDark/Controls/DialogWindow.axaml" />
+    <StyleInclude Source="/TurboVisionDark/Controls/Button.axaml" />
+    <StyleInclude Source="/TurboVisionDark/Controls/DialogWindow.axaml" />
 </Styles>
\ No newline at end of file
diff --git a/src/Consolonia.Themes/Themes/TurboVisionDarkTheme.cs b/src/Consolonia.Themes/TurboVisionDarkTheme.cs
similarity index 100%
rename from src/Consolonia.Themes/Themes/TurboVisionDarkTheme.cs
rename to src/Consolonia.Themes/TurboVisionDarkTheme.cs
diff --git a/src/Consolonia.Themes/Themes/TurboVisionTheme.cs b/src/Consolonia.Themes/TurboVisionTheme.cs
similarity index 100%
rename from src/Consolonia.Themes/Themes/TurboVisionTheme.cs
rename to src/Consolonia.Themes/TurboVisionTheme.cs