diff --git a/comps.xml b/comps.xml
index 2d172df..667a75d 100644
--- a/comps.xml
+++ b/comps.xml
@@ -50,7 +50,7 @@
       <packagereq type="default">nemo-preview</packagereq>
       <packagereq type="default">nemo-emblems</packagereq>
       <packagereq type="default">fluent-theme</packagereq>
-      <packagereq type="default">tau-hydrogen</packagereq>
+      <packagereq type="default">fluent-icon-theme</packagereq>
       <packagereq type="default">gnome-terminal</packagereq>
       <packagereq type="default">seahorse</packagereq>
       <packagereq type="default">gnome-system-monitor</packagereq>
diff --git a/ultramarine/flagship-filesystem/01_ultramarine-budgie.gschema.override b/ultramarine/flagship-filesystem/01_ultramarine-budgie.gschema.override
index 4bcd9f9..465d72f 100644
--- a/ultramarine/flagship-filesystem/01_ultramarine-budgie.gschema.override
+++ b/ultramarine/flagship-filesystem/01_ultramarine-budgie.gschema.override
@@ -3,9 +3,7 @@ picture-uri='file:///usr/share/backgrounds/ultramarine-linux/39/foresty-skies-l.
 picture-uri-dark='file:///usr/share/backgrounds/ultramarine-linux/39/foresty-skies-d.png'
 
 [org.gnome.desktop.wm.preferences]
-button-layout = 'close,minimize,maximize:appmenu'
-titlebar-font='Inter Bold 11'
-
+button-layout = 'appmenu:minimize,maximize,close'
 
 [org.gnome.desktop.screensaver]
 picture-uri='file:///usr/share/backgrounds/ultramarine-linux/39/foresty-skies-d.png'
@@ -14,13 +12,9 @@ picture-uri='file:///usr/share/backgrounds/ultramarine-linux/39/foresty-skies-d.
 scheme='textmate'
 
 [org.gnome.desktop.interface]
-gtk-theme='Fluent-green-Dark'
-icon-theme='Papirus'
+gtk-theme='Fluent-round-Dark'
+icon-theme='Fluent-dark'
 color-scheme='prefer-dark'
-font-name='Inter 11'
-document-font-name='Inter 11'
-# Cursor Theme
-#cursor-theme='Hydrogen'
 
 [org.ubuntubudgie.windowshuffler]
 runshuffler=true
@@ -44,9 +38,8 @@ show-active-mounts=true
 enable-previews=true
 
 [com.solus-project.budgie-wm]
-button-layout='close,minimize,maximize:appmenu'
-# Button style will be aligned to the left, according to our CXO's wishes
-button-style='left'
+button-layout='appmenu:minimize,maximize,close'
+button-style='traditional'
 caffeine-mode=false
 center-windows=false
 
diff --git a/ultramarine/flagship-filesystem/ultramarine-flagship-filesystem.spec b/ultramarine/flagship-filesystem/ultramarine-flagship-filesystem.spec
index ee10203..ffd9a5d 100644
--- a/ultramarine/flagship-filesystem/ultramarine-flagship-filesystem.spec
+++ b/ultramarine/flagship-filesystem/ultramarine-flagship-filesystem.spec
@@ -12,8 +12,7 @@ Requires:       budgie-desktop
 Requires:       budgie-extras
 Requires:       budgie-extras-daemon
 Suggests:       fluent-theme
-Suggests:       papirus-icon-theme
-#Requires:       tau-hydrogen
+Suggests:       fluent-icon-theme
 Requires:       rsms-inter-fonts
 
 %description