diff --git a/src/SharpEmu.GUI/App.axaml b/src/SharpEmu.GUI/App.axaml
index 73ad1099..9adc08f9 100644
--- a/src/SharpEmu.GUI/App.axaml
+++ b/src/SharpEmu.GUI/App.axaml
@@ -1,267 +1,32 @@
- #7C5CFC
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
diff --git a/src/SharpEmu.GUI/Themes/Styles/Base.axaml b/src/SharpEmu.GUI/Themes/Styles/Base.axaml
new file mode 100644
index 00000000..9fdf22b8
--- /dev/null
+++ b/src/SharpEmu.GUI/Themes/Styles/Base.axaml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/SharpEmu.GUI/Themes/Styles/Buttons.axaml b/src/SharpEmu.GUI/Themes/Styles/Buttons.axaml
new file mode 100644
index 00000000..914a41f0
--- /dev/null
+++ b/src/SharpEmu.GUI/Themes/Styles/Buttons.axaml
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/SharpEmu.GUI/Themes/Styles/Console.axaml b/src/SharpEmu.GUI/Themes/Styles/Console.axaml
new file mode 100644
index 00000000..fd5ce385
--- /dev/null
+++ b/src/SharpEmu.GUI/Themes/Styles/Console.axaml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
diff --git a/src/SharpEmu.GUI/Themes/Styles/Inputs.axaml b/src/SharpEmu.GUI/Themes/Styles/Inputs.axaml
new file mode 100644
index 00000000..1a006b0c
--- /dev/null
+++ b/src/SharpEmu.GUI/Themes/Styles/Inputs.axaml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/SharpEmu.GUI/Themes/Styles/Library.axaml b/src/SharpEmu.GUI/Themes/Styles/Library.axaml
new file mode 100644
index 00000000..c4ce1645
--- /dev/null
+++ b/src/SharpEmu.GUI/Themes/Styles/Library.axaml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/SharpEmu.GUI/Themes/Styles/Surfaces.axaml b/src/SharpEmu.GUI/Themes/Styles/Surfaces.axaml
new file mode 100644
index 00000000..81247628
--- /dev/null
+++ b/src/SharpEmu.GUI/Themes/Styles/Surfaces.axaml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/SharpEmu.GUI/Themes/Templates/SettingRow.axaml b/src/SharpEmu.GUI/Themes/Templates/SettingRow.axaml
new file mode 100644
index 00000000..cbeb09b3
--- /dev/null
+++ b/src/SharpEmu.GUI/Themes/Templates/SettingRow.axaml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/SharpEmu.GUI/Themes/Tokens.axaml b/src/SharpEmu.GUI/Themes/Tokens.axaml
new file mode 100644
index 00000000..2a7c9bce
--- /dev/null
+++ b/src/SharpEmu.GUI/Themes/Tokens.axaml
@@ -0,0 +1,32 @@
+
+
+
+ #7C5CFC
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+