diff --git a/conky/.config/conky/left.conkyrc b/conky/.config/conky/left.conkyrc
index a7703a065..1e06aea92 100644
--- a/conky/.config/conky/left.conkyrc
+++ b/conky/.config/conky/left.conkyrc
@@ -79,7 +79,7 @@ conky.config = {
 };
 
 conky.text = [[
-${alignc}${color0}${font2}${time %H:%M}${font}
+${alignc}${color0}${font2}${time %I:%M %p}${font}
 ${voffset 6}${alignc}${color0}${font3}${time %b %d, %Y}${font}${color}
 ${voffset 18}${goto 12}${color3}CPU${goto 50}$cpu%
 ${color2}${goto 12}${cpubar 8,254}
diff --git a/conky/.config/conky/right.conkyrc b/conky/.config/conky/right.conkyrc
index c64b93aba..c908b017f 100644
--- a/conky/.config/conky/right.conkyrc
+++ b/conky/.config/conky/right.conkyrc
@@ -79,7 +79,7 @@ conky.config = {
 };
 
 conky.text = [[
-${alignc}${color0}${font2}${time %H:%M}${font}
+${alignc}${color0}${font2}${time %I:%M %p}${font}
 ${voffset 6}${alignc}${color0}${font3}${time %b %d, %Y}${font}${color}
 ${voffset 18}${goto 12}${color3}CPU${goto 50}$cpu%
 ${color2}${goto 12}${cpubar 8,254}
diff --git a/dconf/.config/dconf/user b/dconf/.config/dconf/user
index 55097321b..d36afe49e 100644
Binary files a/dconf/.config/dconf/user and b/dconf/.config/dconf/user differ
diff --git a/pkgbrowser/.config/pkgbrowser/pkgbrowser.conf b/pkgbrowser/.config/pkgbrowser/pkgbrowser.conf
index 3a7a560d8..e55db6749 100644
--- a/pkgbrowser/.config/pkgbrowser/pkgbrowser.conf
+++ b/pkgbrowser/.config/pkgbrowser/pkgbrowser.conf
@@ -12,6 +12,6 @@ strings=bat, pkgbrowser, ly, zap, i3-gaps, microsoft edge, python3, python, pama
 
 [window]
 central-splitter=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\x1\0\0\0\x1>\0\xff\xff\xff\xff\x1\0\0\0\x1\0)
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\a\x87\0\0\0!\0\0\xe\xf8\0\0\x4\x16\0\0\a\x91\0\0\0+\0\0\xe\xee\0\0\x4\f\0\0\0\x1\0\0\0\0\a\x80\0\0\a\x91\0\0\0+\0\0\xe\xee\0\0\x4\f)
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\a\0\0\0!\0\0\ax\0\0\x4\x16\0\0\0\x11\0\0\0+\0\0\an\0\0\x4\f\0\0\0\0\0\0\0\0\a\x80\0\0\0\x11\0\0\0+\0\0\an\0\0\x4\f)
 left-splitter=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0\xc0\0\0\x1\f\0\xff\xff\xff\xff\x1\0\0\0\x2\0)
 right-splitter=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0\xc0\0\0\0\xee\0\xff\xff\xff\xff\x1\0\0\0\x2\0)
diff --git a/qtile/.config/qtile/groups.py b/qtile/.config/qtile/groups.py
index d6229ac3b..adfd51dc4 100644
--- a/qtile/.config/qtile/groups.py
+++ b/qtile/.config/qtile/groups.py
@@ -1,5 +1,4 @@
 import re
-from libqtile import hook, qtile
 from libqtile.config import Group, Match
 
 
@@ -108,20 +107,3 @@ class Groups(object):
             name='0',
         ),
     ]
-
-# Store the screen_affinity for each group in a dictionary
-group_screen_affinities = {group.name: group.screen_affinity for group in Groups.groups}
-
-@hook.subscribe.client_focus
-def enforce_screen_affinity(window):
-    group_name = window.group.name
-
-    # If the group has a specified screen_affinity, enforce it
-    if group_name in group_screen_affinities:
-        desired_screen = group_screen_affinities[group_name]
-        current_screen = qtile.screens.index(qtile.current_screen)
-
-        # If the window is focused on a different screen than the desired screen,
-        # move the window back to the desired screen
-        if current_screen != desired_screen:
-            window.togroup(group_name)