diff --git a/TuneLab/App.axaml b/TuneLab/App.axaml
index 28dd55d..d9d5051 100644
--- a/TuneLab/App.axaml
+++ b/TuneLab/App.axaml
@@ -6,6 +6,7 @@
 
     <Application.Styles>
         <FluentTheme />
+		<StyleInclude Source="avares://TuneLab/Assets/GlobalStyle.axaml"/>
     </Application.Styles>
 	<Application.Resources>
 		<FontFamily x:Key="NotoMono">avares://TuneLab/Assets/Fonts#NotoMono</FontFamily>
diff --git a/TuneLab/Assets/GlobalStyle.axaml b/TuneLab/Assets/GlobalStyle.axaml
new file mode 100644
index 0000000..cd091a3
--- /dev/null
+++ b/TuneLab/Assets/GlobalStyle.axaml
@@ -0,0 +1,21 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+	<Style Selector="MenuItem > MenuItem">
+		<Setter Property="Foreground" Value="White"/>
+		<Setter Property="Background" Value="#272736"/>
+	</Style>
+
+	<Style Selector="ListBoxItem:selected /template/ ContentPresenter">
+		<Setter Property="Background" Value="#6060C0"/>
+	</Style>
+
+	<Style Selector="ComboBox:dropdownopen /template/ Border#PopupBorder">
+		<Setter Property="Background" Value="#1B1B24" />
+		<Setter Property="BorderBrush" Value="#1B1B24" />
+		<Setter Property="TextBlock.Foreground" Value="White" />
+	</Style>
+
+	<Style Selector="ComboBoxItem:selected /template/ ContentPresenter">
+		<Setter Property="Background" Value="#6060C0"/>
+	</Style>
+</Styles>
diff --git a/TuneLab/Views/MainWindow.axaml b/TuneLab/Views/MainWindow.axaml
index 06898d0..9b13432 100644
--- a/TuneLab/Views/MainWindow.axaml
+++ b/TuneLab/Views/MainWindow.axaml
@@ -11,13 +11,7 @@
 		ExtendClientAreaTitleBarHeightHint="40"
 		ExtendClientAreaToDecorationsHint="True"
 		SizeChanged="Window_SizeChanged">
-
-	<Window.Styles>
-		<Style Selector="MenuItem > MenuItem">
-			<Setter Property="Foreground" Value="White"/>
-			<Setter Property="Background" Value="#272736"/>
-		</Style>
-	</Window.Styles>
+	
 	<Window.Resources>
 		<SolidColorBrush x:Key="MenuFlyoutPresenterBackground">#272736</SolidColorBrush>
 	</Window.Resources>
diff --git a/TuneLab/Views/TrackSelector.axaml b/TuneLab/Views/TrackSelector.axaml
index 30a215c..5671595 100644
--- a/TuneLab/Views/TrackSelector.axaml
+++ b/TuneLab/Views/TrackSelector.axaml
@@ -38,8 +38,7 @@
 				</StackPanel>
 
 				<StackPanel Grid.Row="1" Orientation="Vertical" Margin="24, 16, 24, 16" HorizontalAlignment="Center" VerticalAlignment="Center" x:Name="TrackSelectBox">
-					<ListBox x:Name="mTrackList" Width="432" Height="168" FontSize="14">
-					</ListBox>
+					<ListBox x:Name="mTrackList" Width="432" Height="168" FontSize="14" CornerRadius="4" />
 				</StackPanel>
 
 				<Grid Grid.Row="2" x:Name="ActionsPanel" Margin="24, 16, 24, 16">
diff --git a/TuneLab/Views/TrackSelector.axaml.cs b/TuneLab/Views/TrackSelector.axaml.cs
index e10a397..8809193 100644
--- a/TuneLab/Views/TrackSelector.axaml.cs
+++ b/TuneLab/Views/TrackSelector.axaml.cs
@@ -8,6 +8,7 @@
 using TuneLab.GUI;
 using TuneLab.Utils;
 using Button = TuneLab.GUI.Components.Button;
+using CheckBox = TuneLab.GUI.Components.CheckBox;
 
 namespace TuneLab.Views;
 internal partial class TrackSelector : Window
@@ -42,7 +43,7 @@ public TrackSelector()
         KeepTempoPanel.Orientation = Orientation.Horizontal;
         KeepTempoPanel.Height = 24;
         KeepTempoPanel.Children.Add(mKeepTempoCheckBox);
-        KeepTempoPanel.Children.Add(new Label() { Content = "Keep Tempo", FontSize = 12, Foreground = Style.TEXT_LIGHT.ToBrush(), Margin = new(0, 1) });
+        KeepTempoPanel.Children.Add(new Label() { Content = "Keep Tempo", FontSize = 12, Foreground = Style.TEXT_LIGHT.ToBrush(), Margin = new(14, 1) });
         ActionsPanel.Children.Add(KeepTempoPanel);
         Grid.SetColumn(KeepTempoPanel, 0);