diff --git a/Resources/themes/0x96f.plist b/Resources/themes/0x96f.plist
index 84e3b8d..54cebc9 100644
--- a/Resources/themes/0x96f.plist
+++ b/Resources/themes/0x96f.plist
@@ -5,7 +5,7 @@
 	<key>id</key>
 	<string>0x96f</string>
 	<key>name</key>
-	<string>0x96f</string>
+	<string>28093A65-866F-42F7-9CB0-49D1D1097A1E</string>
 	<key>Ansi 0 Color</key>
 	<dict>
 		<key>Alpha Component</key>
diff --git a/Resources/themes/catppuccinFrappe.plist b/Resources/themes/catppuccinFrappe.plist
index 0ec5086..c265be0 100644
--- a/Resources/themes/catppuccinFrappe.plist
+++ b/Resources/themes/catppuccinFrappe.plist
@@ -5,7 +5,7 @@
 	<key>id</key>
 	<string>catppuccinFrappe</string>
 	<key>name</key>
-	<string>catppuccinFrappe</string>
+	<string>130DF195-4925-45E6-A251-7602E53DB1F4</string>
 	<key>Ansi 0 Color</key>
 	<dict>
 		<key>Alpha Component</key>
diff --git a/Resources/themes/catppuccinMocha.plist b/Resources/themes/catppuccinMocha.plist
index 39d845c..9c42f49 100644
--- a/Resources/themes/catppuccinMocha.plist
+++ b/Resources/themes/catppuccinMocha.plist
@@ -5,7 +5,7 @@
 	<key>id</key>
 	<string>catppuccinMocha</string>
 	<key>name</key>
-	<string>catppuccinMocha</string>
+	<string>D7CCC116-0AFA-49CD-8E4C-BDFADE06877C</string>
 	<key>Ansi 0 Color</key>
 	<dict>
 		<key>Alpha Component</key>
diff --git a/Resources/themes/defaultTheme.plist b/Resources/themes/defaultTheme.plist
index 7e4275d..1168d5f 100644
--- a/Resources/themes/defaultTheme.plist
+++ b/Resources/themes/defaultTheme.plist
@@ -5,7 +5,7 @@
 	<key>id</key>
 	<string>defaultTheme</string>
 	<key>name</key>
-	<string>defaultTheme</string>
+	<string>907AC82C-F31D-4625-BE99-539ABA97C7E7</string>
 	<key>Ansi 0 Color</key>
 	<dict>
 		<key>Red Component</key>
diff --git a/Resources/themes/dracula.plist b/Resources/themes/dracula.plist
index 2ab2649..5f1a4b2 100644
--- a/Resources/themes/dracula.plist
+++ b/Resources/themes/dracula.plist
@@ -5,7 +5,7 @@
 	<key>id</key>
 	<string>dracula</string>
 	<key>name</key>
-	<string>dracula</string>
+	<string>41FD85F7-2129-4494-930A-BAE08D51F517</string>
 	<key>Ansi 0 Color</key>
 	<dict>
 		<key>Alpha Component</key>
diff --git a/Resources/themes/gruvboxDark.plist b/Resources/themes/gruvboxDark.plist
index 1bc4c38..7250da0 100644
--- a/Resources/themes/gruvboxDark.plist
+++ b/Resources/themes/gruvboxDark.plist
@@ -5,7 +5,7 @@
 	<key>id</key>
 	<string>gruvboxDark</string>
 	<key>name</key>
-	<string>gruvboxDark</string>
+	<string>EDAB6C07-3244-495D-8773-FDF3B8777139</string>
 	<key>Ansi 0 Color</key>
 	<dict>
 		<key>Alpha Component</key>
diff --git a/Resources/themes/iTerm2SolarizedDark.plist b/Resources/themes/iTerm2SolarizedDark.plist
index 5c709d6..c075f41 100644
--- a/Resources/themes/iTerm2SolarizedDark.plist
+++ b/Resources/themes/iTerm2SolarizedDark.plist
@@ -5,7 +5,7 @@
 	<key>id</key>
 	<string>iTerm2SolarizedDark</string>
 	<key>name</key>
-	<string>iTerm2SolarizedDark</string>
+	<string>92F1B72C-221F-4780-906C-4498D6C7EEC5</string>
 	<key>Ansi 0 Color</key>
 	<dict>
 		<key>Alpha Component</key>
diff --git a/Resources/themes/iTerm2SolarizedLight.plist b/Resources/themes/iTerm2SolarizedLight.plist
index 85aad1c..b41fd6a 100644
--- a/Resources/themes/iTerm2SolarizedLight.plist
+++ b/Resources/themes/iTerm2SolarizedLight.plist
@@ -5,7 +5,7 @@
 	<key>id</key>
 	<string>iTerm2SolarizedLight</string>
 	<key>name</key>
-	<string>iTerm2SolarizedLight</string>
+	<string>3B37ACD2-C3CF-49B4-9B9D-27E76244E108</string>
 	<key>Ansi 0 Color</key>
 	<dict>
 		<key>Alpha Component</key>
diff --git a/Resources/themes/tomorrowNight.plist b/Resources/themes/tomorrowNight.plist
index bfcd61c..6263949 100644
--- a/Resources/themes/tomorrowNight.plist
+++ b/Resources/themes/tomorrowNight.plist
@@ -5,7 +5,7 @@
 	<key>id</key>
 	<string>tomorrowNight</string>
 	<key>name</key>
-	<string>tomorrowNight</string>
+	<string>FC93B1E7-BB8B-4F73-B6AA-DEF2AF201B61</string>
 	<key>Ansi 0 Color</key>
 	<dict>
 		<key>Blue Component</key>
diff --git a/Resources/themes/ubuntu.plist b/Resources/themes/ubuntu.plist
index f76e5cb..e4fe1a7 100644
--- a/Resources/themes/ubuntu.plist
+++ b/Resources/themes/ubuntu.plist
@@ -5,7 +5,7 @@
 	<key>id</key>
 	<string>ubuntu</string>
 	<key>name</key>
-	<string>ubuntu</string>
+	<string>7B93836A-54AE-4AB0-A41D-7473D72A5419</string>
 	<key>Ansi 0 Color</key>
 	<dict>
 		<key>Blue Component</key>
diff --git a/Resources/themes/xcodedark.plist b/Resources/themes/xcodedark.plist
index 47834bb..e8db3bb 100644
--- a/Resources/themes/xcodedark.plist
+++ b/Resources/themes/xcodedark.plist
@@ -5,7 +5,7 @@
 	<key>id</key>
 	<string>xcodedark</string>
 	<key>name</key>
-	<string>xcodedark</string>
+	<string>0D6242BB-8961-4A1D-BD08-81BCC1B24528</string>
 	<key>Ansi 0 Color</key>
 	<dict>
 		<key>Alpha Component</key>
diff --git a/Resources/themes/xcodedarkhc.plist b/Resources/themes/xcodedarkhc.plist
index 9a121ed..8c1caa4 100644
--- a/Resources/themes/xcodedarkhc.plist
+++ b/Resources/themes/xcodedarkhc.plist
@@ -5,7 +5,7 @@
 	<key>id</key>
 	<string>xcodedarkhc</string>
 	<key>name</key>
-	<string>xcodedarkhc</string>
+	<string>C95378B5-F183-4E40-B8F8-3CDD681E6B9A</string>
 	<key>Ansi 0 Color</key>
 	<dict>
 		<key>Alpha Component</key>
diff --git a/Resources/themes/xcodewwdc.plist b/Resources/themes/xcodewwdc.plist
index 59ec2e7..6d344f1 100644
--- a/Resources/themes/xcodewwdc.plist
+++ b/Resources/themes/xcodewwdc.plist
@@ -5,7 +5,7 @@
 	<key>id</key>
 	<string>xcodewwdc</string>
 	<key>name</key>
-	<string>xcodewwdc</string>
+	<string>884DB359-9154-4038-AD54-C15001FA59BA</string>
 	<key>Ansi 0 Color</key>
 	<dict>
 		<key>Alpha Component</key>
diff --git a/ShhShell/Host/HostsManager.swift b/ShhShell/Host/HostsManager.swift
index d67be55..797a13f 100644
--- a/ShhShell/Host/HostsManager.swift
+++ b/ShhShell/Host/HostsManager.swift
@@ -57,10 +57,7 @@ class HostsManager: ObservableObject, @unchecked Sendable {
 	}
 	
 	func isThemeSelected(_ themeInQuestion: Theme) -> Bool {
-		var themeInQWithSameID = themeInQuestion
-		themeInQWithSameID.id = selectedTheme.id
-		
-		return themeInQWithSameID == self.selectedTheme
+		return themeInQuestion == self.selectedTheme
 	}
 	
 	func renameTheme(_ theme: Theme?, to newName: String) {