diff --git a/ShhShell/Views/Themes/AnsiPickerView.swift b/ShhShell/Views/Themes/AnsiPickerView.swift
index c1b46b4..9ffdb61 100644
--- a/ShhShell/Views/Themes/AnsiPickerView.swift
+++ b/ShhShell/Views/Themes/AnsiPickerView.swift
@@ -10,6 +10,8 @@ import SwiftUI
 struct AnsiPickerView: View {
 	@ObservedObject var hostsManager: HostsManager
 	
+	@Environment(\.colorScheme) var colorScheme
+	
 	var body: some View {
 		ZStack(alignment: .center) {
 			RoundedRectangle(cornerRadius: 15)
@@ -26,6 +28,10 @@ struct AnsiPickerView: View {
 								RoundedRectangle(cornerRadius: isSelected ? 5 : 0)
 									.fill(hostsManager.selectedTheme.ansi[index].suiColor)
 									.padding(isSelected ? 5 : 0)
+									.shadow(
+										color: colorScheme == .dark ? .white : .black,
+										radius: isSelected ? 2 : 0
+									)
 									.onTapGesture {
 										hostsManager.selectAnsi(index)
 									}
diff --git a/ShhShell/Views/Themes/ThemeManagerView.swift b/ShhShell/Views/Themes/ThemeManagerView.swift
index 8b0bbea..c260e62 100644
--- a/ShhShell/Views/Themes/ThemeManagerView.swift
+++ b/ShhShell/Views/Themes/ThemeManagerView.swift
@@ -53,7 +53,6 @@ struct ThemeManagerView: View {
 						
 						HStack {
 							Text("Your Themes")
-								.padding(.top)
 								.padding(.horizontal)
 								.font(.headline)
 							Spacer()
@@ -94,6 +93,7 @@ struct ThemeManagerView: View {
 							}
 						}
 						.padding(.horizontal)
+						.padding(.bottom)
 						.animation(.default, value: hostsManager.themes)
 					}
 					.navigationTitle("Themes")