diff --git a/.config/gnome-settings/app-folders.ini b/.config/gnome-settings/app-folders.ini
index ecfca04..044ded2 100644
--- a/.config/gnome-settings/app-folders.ini
+++ b/.config/gnome-settings/app-folders.ini
@@ -3,12 +3,12 @@ folder-children=['Browsers', 'Communication', 'Develop', 'Files', 'Multimedia',
 
 
 [org/gnome/desktop/app-folders/folders/Browsers]
-apps=['google-chrome.desktop', 'firefox.desktop']
+apps=['google-chrome.desktop', 'org.mozilla.firefox.desktop']
 name='Browsers'
 translate=true
 
 [org/gnome/desktop/app-folders/folders/Communication]
-apps=['evolution-calendar.desktop', 'mozilla-thunderbird.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Contacts.desktop', 'org.gnome.Evolution.desktop', 'org.telegram.desktop.desktop', 'Zoom.desktop']
+apps=['org.mozilla.thunderbird.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Contacts.desktop', 'org.gnome.Evolution.desktop', 'org.telegram.desktop.desktop', 'Zoom.desktop']
 name='Communication'
 translate=true
 
@@ -38,7 +38,7 @@ name='Remote'
 translate=true
 
 [org/gnome/desktop/app-folders/folders/Settings]
-apps=['ca.desrt.dconf-editor.desktop', 'com.github.joseexposito.touche.desktop', 'com.system76.keyboardconfigurator.desktop', 'firewall-config.desktop', 'gnome-language-selector.desktop', 'gnome-session-properties.desktop', 'gnome-system-monitor.desktop', 'im-config.desktop', 'menulibre.desktop', 'nm-connection-editor.desktop', 'nvidia-settings.desktop', 'org.bleachbit.BleachBit.desktop', 'org.gnome.Extensions.desktop', 'org.gnome.PowerStats.desktop', 'org.gnome.Settings.desktop', 'org.gnome.Software.desktop', 'org.gnome.tweaks.desktop', 'pavucontrol.desktop', 'software-properties-gnome.desktop', 'system76-driver.desktop', 'system76-firmware.desktop']
+apps=['ca.desrt.dconf-editor.desktop', 'com.github.joseexposito.touche.desktop', 'com.system76.keyboardconfigurator.desktop', 'firewall-config.desktop', 'gnome-language-selector.desktop', 'gnome-session-properties.desktop', 'gnome-system-monitor.desktop', 'im-config.desktop', 'menulibre.desktop', 'nm-connection-editor.desktop', 'nvidia-settings.desktop', 'org.bleachbit.BleachBit.desktop', 'org.gnome.Extensions.desktop', 'org.gnome.PowerStats.desktop', 'org.gnome.Settings.desktop', 'org.gnome.Software.desktop', 'org.gnome.tweaks.desktop', 'org.pulseaudio.pavucontrol.desktop', 'software-properties-gnome.desktop', 'system76-driver.desktop', 'system76-firmware.desktop']
 name='Settings'
 translate=true
 
diff --git a/.config/gnome-settings/notifications.ini b/.config/gnome-settings/notifications.ini
index b41ab20..bd30b0f 100644
--- a/.config/gnome-settings/notifications.ini
+++ b/.config/gnome-settings/notifications.ini
@@ -37,9 +37,6 @@ enable=false
 [org/gnome/desktop/notifications/application/display-im6-q16]
 enable=false
 
-[org/gnome/desktop/notifications/application/firefox]
-enable=false
-
 [org/gnome/desktop/notifications/application/firewall-config]
 enable=false
 
@@ -129,9 +126,6 @@ enable=false
 [org/gnome/desktop/notifications/application/menulibre]
 enable=false
 
-[org/gnome/desktop/notifications/application/mozilla-thunderbird]
-enable=false
-
 [org/gnome/desktop/notifications/application/nm-connection-editor]
 enable=false
 
@@ -231,15 +225,21 @@ enable=false
 [org/gnome/desktop/notifications/application/org-gnome-tweaks]
 enable=false
 
+[org/gnome/desktop/notifications/application/org-mozilla-firefox]
+enable=false
+
+[org/gnome/desktop/notifications/application/org-mozilla-thunderbird]
+enable=false
+
+[org/gnome/desktop/notifications/application/org-pulseaudio-pavucontrol]
+enable=false
+
 [org/gnome/desktop/notifications/application/org-remmina-remmina]
 enable=false
 
 [org/gnome/desktop/notifications/application/org-telegram-desktop]
 enable=false
 
-[org/gnome/desktop/notifications/application/pavucontrol]
-enable=false
-
 [org/gnome/desktop/notifications/application/pop-cosmic-applications]
 enable=false
 
diff --git a/.config/gnome-settings/shell-extensions.ini b/.config/gnome-settings/shell-extensions.ini
index 53c23bb..9447975 100644
--- a/.config/gnome-settings/shell-extensions.ini
+++ b/.config/gnome-settings/shell-extensions.ini
@@ -11,7 +11,7 @@ sort-folder-contents=true
 
 
 [org/gnome/shell/extensions/auto-move-windows]
-application-list=['firefox.desktop:1', 'com.google.Chrome.desktop:2', 'com.discordapp.Discord.desktop:3', 'org.telegram.desktop.desktop:3', 'Zoom.desktop:3', 'org.gnome.Evolution.desktop:4', 'mozilla-thunderbird.desktop:4', 'com.spotify.Client.desktop:9', 'org.gnome.Settings.desktop:10', 'gnome-background-panel.desktop:10', 'gnome-bluetooth-panel.desktop:10', 'bluetooth-sendto.desktop:10', 'gnome-display-panel.desktop:10', 'gnome-info-overview-panel.desktop:10', 'gnome-keyboard-panel.desktop:10', 'gnome-network-panel.desktop:10', 'gnome-notifications-panel.desktop:10', 'gnome-power-panel.desktop:10', 'gnome-printers-panel.desktop:10', 'gnome-sound-panel.desktop:10', 'gnome-wifi-panel.desktop:10', 'nvidia-settings.desktop:10', 'pavucontrol.desktop:10']
+application-list=['org.mozilla.firefox.desktop:1', 'com.google.Chrome.desktop:2', 'com.discordapp.Discord.desktop:3', 'org.telegram.desktop.desktop:3', 'Zoom.desktop:3', 'org.gnome.Evolution.desktop:4', 'org.mozilla.thunderbird.desktop:4', 'com.spotify.Client.desktop:9', 'org.gnome.Settings.desktop:10', 'gnome-background-panel.desktop:10', 'gnome-bluetooth-panel.desktop:10', 'bluetooth-sendto.desktop:10', 'gnome-display-panel.desktop:10', 'gnome-info-overview-panel.desktop:10', 'gnome-keyboard-panel.desktop:10', 'gnome-network-panel.desktop:10', 'gnome-notifications-panel.desktop:10', 'gnome-power-panel.desktop:10', 'gnome-printers-panel.desktop:10', 'gnome-sound-panel.desktop:10', 'gnome-wifi-panel.desktop:10', 'nvidia-settings.desktop:10', 'org.pulseaudio.pavucontrol.desktop:10']
 
 
 [org/gnome/shell/extensions/blur-my-shell/applications]