diff --git a/App/Sources/Core/MainWindowStatePublisher.swift b/App/Sources/Core/MainWindowStatePublisher.swift
new file mode 100644
index 00000000..0bdacc09
--- /dev/null
+++ b/App/Sources/Core/MainWindowStatePublisher.swift
@@ -0,0 +1,8 @@
+//
+//  MainWindowStatePublisher.swift
+//  Keyboard-Cowboy
+//
+//  Created by Christoffer Winterkvist on 10/24/24.
+//
+
+import Foundation
diff --git a/App/Sources/UI/Views/GroupIconView.swift b/App/Sources/UI/Views/GroupIconView.swift
index 1c1e7b7e..a2de6593 100644
--- a/App/Sources/UI/Views/GroupIconView.swift
+++ b/App/Sources/UI/Views/GroupIconView.swift
@@ -13,7 +13,6 @@ struct GroupIconView: View {
       .grayscale(controlActiveState == .key ? 0 : 0.2)
       .opacity(controlActiveState == .key ? 1 : 0.8)
       .overlay(GroupIconOverlayView(icon: icon, symbol: symbol))
-      .drawingGroup()
   }
 }
 
diff --git a/App/Sources/UI/Views/Icons/ActivateLastApplicationIconView.swift b/App/Sources/UI/Views/Icons/ActivateLastApplicationIconView.swift
index 87743c8c..49afaabb 100644
--- a/App/Sources/UI/Views/Icons/ActivateLastApplicationIconView.swift
+++ b/App/Sources/UI/Views/Icons/ActivateLastApplicationIconView.swift
@@ -28,7 +28,6 @@ struct ActivateLastApplicationIconView: View {
         .shadow(color: Color(nsColor: .systemPink.blended(withFraction: 0.4, of: .black)!), radius: 2, y: 1)
       }
       .frame(width: size, height: size)
-      .drawingGroup(opaque: true)
       .fixedSize()
       .iconShape(size)
   }
diff --git a/App/Sources/UI/Views/Icons/BugFixIconView.swift b/App/Sources/UI/Views/Icons/BugFixIconView.swift
index 51cc380c..006c9df6 100644
--- a/App/Sources/UI/Views/Icons/BugFixIconView.swift
+++ b/App/Sources/UI/Views/Icons/BugFixIconView.swift
@@ -27,7 +27,6 @@ struct BugFixIconView: View {
       }
       .frame(width: size, height: size)
       .fixedSize()
-      .drawingGroup(opaque: true)
       .iconShape(size)
   }
 }
diff --git a/App/Sources/UI/Views/Icons/DockIconView.swift b/App/Sources/UI/Views/Icons/DockIconView.swift
index 67172dea..c951ba90 100644
--- a/App/Sources/UI/Views/Icons/DockIconView.swift
+++ b/App/Sources/UI/Views/Icons/DockIconView.swift
@@ -56,7 +56,6 @@ struct DockIconView: View {
       })
       .frame(width: size, height: size)
       .fixedSize()
-      .drawingGroup(opaque: true)
       .iconShape(size)
   }
 }
diff --git a/App/Sources/UI/Views/Icons/GenericAppIconView.swift b/App/Sources/UI/Views/Icons/GenericAppIconView.swift
index 9938f338..bcce668b 100644
--- a/App/Sources/UI/Views/Icons/GenericAppIconView.swift
+++ b/App/Sources/UI/Views/Icons/GenericAppIconView.swift
@@ -49,7 +49,6 @@ struct GenericAppIconView: View {
       }
       .frame(width: size, height: size)
       .fixedSize()
-      .drawingGroup(opaque: true)
       .iconShape(size)
   }
 }
diff --git a/App/Sources/UI/Views/Icons/HideAllAppsIconView.swift b/App/Sources/UI/Views/Icons/HideAllAppsIconView.swift
index 44ca14c9..cbfc4e07 100644
--- a/App/Sources/UI/Views/Icons/HideAllAppsIconView.swift
+++ b/App/Sources/UI/Views/Icons/HideAllAppsIconView.swift
@@ -70,7 +70,6 @@ struct HideAllIconView: View {
       }
       .frame(width: size, height: size)
       .fixedSize()
-      .drawingGroup(opaque: true)
       .iconShape(size)
   }
 }
diff --git a/App/Sources/UI/Views/Icons/KeyboardCleanerIcon.swift b/App/Sources/UI/Views/Icons/KeyboardCleanerIcon.swift
index ecddad41..007d6bd8 100644
--- a/App/Sources/UI/Views/Icons/KeyboardCleanerIcon.swift
+++ b/App/Sources/UI/Views/Icons/KeyboardCleanerIcon.swift
@@ -21,7 +21,6 @@ struct KeyboardCleanerIcon: View {
       .overlay { iconBorder(size) }
       .frame(width: size, height: size)
       .fixedSize()
-      .drawingGroup(opaque: true)
       .overlay {
         VStack(spacing: size * 0.02) {
           HStack(spacing: size * 0.02) {
diff --git a/App/Sources/UI/Views/Icons/KeyboardIconView.swift b/App/Sources/UI/Views/Icons/KeyboardIconView.swift
index 86de08ca..70bf40b1 100644
--- a/App/Sources/UI/Views/Icons/KeyboardIconView.swift
+++ b/App/Sources/UI/Views/Icons/KeyboardIconView.swift
@@ -40,7 +40,6 @@ struct KeyboardIconView: View {
       }
       .frame(width: size, height: size)
       .fixedSize()
-      .drawingGroup(opaque: true)
       .iconShape(size)
 //      .background(
 //        Rectangle()
diff --git a/App/Sources/UI/Views/Icons/MacroIconView.swift b/App/Sources/UI/Views/Icons/MacroIconView.swift
index 77576dc3..2d91473d 100644
--- a/App/Sources/UI/Views/Icons/MacroIconView.swift
+++ b/App/Sources/UI/Views/Icons/MacroIconView.swift
@@ -79,7 +79,6 @@ struct MacroIconView: View {
           .frame(width: size * 0.25, height: size * 0.25)
           .offset(x: -size * 0.075, y: -size * 0.075)
       }
-      .drawingGroup(opaque: true)
       .frame(width: size, height: size)
       .fixedSize()
       .iconShape(size)
diff --git a/App/Sources/UI/Views/Icons/MoveFocusToWindowIconView.swift b/App/Sources/UI/Views/Icons/MoveFocusToWindowIconView.swift
index 083f706f..9b054f0a 100644
--- a/App/Sources/UI/Views/Icons/MoveFocusToWindowIconView.swift
+++ b/App/Sources/UI/Views/Icons/MoveFocusToWindowIconView.swift
@@ -56,7 +56,6 @@ struct MoveFocusToWindowIconView: View {
       }
       .frame(width: size, height: size)
       .fixedSize()
-      .drawingGroup(opaque: true)
       .iconShape(size)
 
   }
diff --git a/App/Sources/UI/Views/Icons/RepeatLastWorkflowIconView.swift b/App/Sources/UI/Views/Icons/RepeatLastWorkflowIconView.swift
index 7b98c813..d662c4e4 100644
--- a/App/Sources/UI/Views/Icons/RepeatLastWorkflowIconView.swift
+++ b/App/Sources/UI/Views/Icons/RepeatLastWorkflowIconView.swift
@@ -25,7 +25,6 @@ struct RepeatLastWorkflowIconView: View {
       }
       .frame(width: size, height: size)
       .fixedSize()
-      .drawingGroup(opaque: true)
       .iconShape(size)
   }
 }
diff --git a/App/Sources/UI/Views/Icons/TypingIconView.swift b/App/Sources/UI/Views/Icons/TypingIconView.swift
index 97e401e5..9360ec71 100644
--- a/App/Sources/UI/Views/Icons/TypingIconView.swift
+++ b/App/Sources/UI/Views/Icons/TypingIconView.swift
@@ -59,7 +59,6 @@ struct TypingIconView: View {
       }
       .frame(width: size, height: size)
       .fixedSize()
-      .drawingGroup(opaque: true)
       .iconShape(size)
   }
 
diff --git a/App/Sources/UI/Views/Icons/UIElementIconView.swift b/App/Sources/UI/Views/Icons/UIElementIconView.swift
index ed6cfe84..ca5acd77 100644
--- a/App/Sources/UI/Views/Icons/UIElementIconView.swift
+++ b/App/Sources/UI/Views/Icons/UIElementIconView.swift
@@ -17,7 +17,6 @@ struct UIElementIconView: View {
     .compositingGroup()
     .frame(width: size, height: size)
     .fixedSize()
-    .drawingGroup(opaque: true)
     .iconShape(size)
   }
 }
diff --git a/App/Sources/UI/Views/Icons/WindowManagementIconView.swift b/App/Sources/UI/Views/Icons/WindowManagementIconView.swift
index a37f191e..f62b6eb3 100644
--- a/App/Sources/UI/Views/Icons/WindowManagementIconView.swift
+++ b/App/Sources/UI/Views/Icons/WindowManagementIconView.swift
@@ -98,7 +98,7 @@ struct WindowManagementIconBackgroundView: View {
       }
       .blur(radius: 1)
       .compositingGroup()
-      .drawingGroup()
+//      .drawingGroup()
   }
 }
 
@@ -140,7 +140,6 @@ private struct WindowManagementIconWindowControlsView: View {
     .fontWeight(.bold)
     .padding([.top, .leading, .trailing], size * 0.0_5)
     .frame(height: size * 0.25)
-    .drawingGroup()
   }
 }
 
diff --git a/App/Sources/UI/Views/Keyboard/KeyBackgroundView.swift b/App/Sources/UI/Views/Keyboard/KeyBackgroundView.swift
index 303102b6..64550ea9 100644
--- a/App/Sources/UI/Views/Keyboard/KeyBackgroundView.swift
+++ b/App/Sources/UI/Views/Keyboard/KeyBackgroundView.swift
@@ -27,7 +27,6 @@ struct KeyBackgroundView: View {
           .init(color: Color(.windowBackgroundColor), location: 1.0),
         ], startPoint: .top, endPoint: .bottom)
       }
-      .drawingGroup(opaque: true)
       .iconShape(height * 0.8)
   }
 }
diff --git a/App/Sources/UI/Views/SingleDetailView.swift b/App/Sources/UI/Views/SingleDetailView.swift
index 15ae4d67..2da76e59 100644
--- a/App/Sources/UI/Views/SingleDetailView.swift
+++ b/App/Sources/UI/Views/SingleDetailView.swift
@@ -107,7 +107,6 @@ struct SingleDetailView: View {
         .padding(.bottom, 24)
         .background(alignment: .bottom, content: { 
           SingleDetailBackgroundView()
-            .drawingGroup()
         })
 
       WorkflowCommandListView(