diff --git a/components/composite/ThemeComboBox.qml b/components/composite/ThemeComboBox.qml
deleted file mode 100644
index 8ba673b..0000000
--- a/components/composite/ThemeComboBox.qml
+++ /dev/null
@@ -1,20 +0,0 @@
-import qs.components
-import qs.config
-import QtQuick
-
-StyledComboBox {
-    id: control
-
-    currentIndex: Theme.themes.indexOf(Theme.currentTheme)
-    model: Theme.themes
-    onActivated: index => {
-        Theme.currentTheme = Theme.themes[index];
-    }
-
-    Component.onCompleted: {
-        control.currentIndex = Theme.themes.indexOf(Theme.currentTheme);
-        Theme.onCurrentThemeChanged = () => {
-            Theme.themes.indexOf(Theme.currentTheme);
-        };
-    }
-}
diff --git a/config/Theme.qml b/config/Theme.qml
index bd09368..596c9ac 100644
--- a/config/Theme.qml
+++ b/config/Theme.qml
@@ -8,6 +8,7 @@ import Quickshell.Io
 Singleton {
     id: root
 
+    property string fontFamily: "JetBrainsMono Nerd Font"
     property var palette: theme.palette
 
     property alias themes: cache.themes
diff --git a/modules/configuration/StylingView.qml b/modules/configuration/StylingView.qml
index 5454953..731ecaf 100644
--- a/modules/configuration/StylingView.qml
+++ b/modules/configuration/StylingView.qml
@@ -1,5 +1,4 @@
 import qs.components
-import qs.components.composite
 import qs.config
 import QtQuick
 import QtQuick.Layouts
@@ -11,9 +10,16 @@ StyledPane {
 
         StyledText {
             text: "Theme"
+            // font.bold: true
             font.pixelSize: Styling.typography.textSize.lg
         }
 
-        ThemeComboBox {}
+        StyledComboBox {
+            currentIndex: Theme.themes.indexOf(Theme.currentTheme)
+            model: Theme.themes
+            onActivated: index => {
+                Theme.currentTheme = Theme.themes[index];
+            }
+        }
     }
 }
diff --git a/modules/pomodoro/Pomodoro.qml b/modules/pomodoro/Pomodoro.qml
index eaa2d95..034e479 100644
--- a/modules/pomodoro/Pomodoro.qml
+++ b/modules/pomodoro/Pomodoro.qml
@@ -55,7 +55,7 @@ StyledPanelWindow {
                     id: circle
                     radius: 150
                     borderColor: Styling.theme.base100
-                    strokeColor: PomodoroService.state == "timer" ? Styling.theme.primary : Styling.theme.warning
+                    strokeColor: PomodoroService.state == "timer" ? Theme.palette.primary : Theme.palette.warning
                     strokeWidth: 12
                     fillColor: button.hovered ? Styling.theme.primary : "transparent"
                     percentage: (PomodoroService.state == "timer" ? (PomodoroService.initialTime - PomodoroService.remainingTime) : PomodoroService.remainingTime) / PomodoroService.initialTime % 1