diff --git a/generic/configuration.nix b/general/configuration.nix
similarity index 100%
rename from generic/configuration.nix
rename to general/configuration.nix
diff --git a/generic/gaming.nix b/general/gaming.nix
similarity index 100%
rename from generic/gaming.nix
rename to general/gaming.nix
diff --git a/generic/networking.nix b/general/networking.nix
similarity index 100%
rename from generic/networking.nix
rename to general/networking.nix
diff --git a/generic/packages.nix b/general/packages.nix
similarity index 100%
rename from generic/packages.nix
rename to general/packages.nix
diff --git a/generic/specialisation.nix b/general/specialisation.nix
similarity index 100%
rename from generic/specialisation.nix
rename to general/specialisation.nix
diff --git a/generic/system.nix b/general/system.nix
similarity index 100%
rename from generic/system.nix
rename to general/system.nix
diff --git a/generic/user/home.nix b/general/user/home.nix
similarity index 100%
rename from generic/user/home.nix
rename to general/user/home.nix
diff --git a/generic/user/packages.nix b/general/user/packages.nix
similarity index 95%
rename from generic/user/packages.nix
rename to general/user/packages.nix
index 543e4f3..f2394b0 100644
--- a/generic/user/packages.nix
+++ b/general/user/packages.nix
@@ -49,7 +49,7 @@ in {
     video-trimmer
 
     # Audio
-    shorwave
+    shortwave
     gnome-podcasts
     helvum
 
@@ -112,9 +112,9 @@ in {
     libreoffice
     onlyoffice-bin
     hunspell
-    hunspellDicts.fr_FR
+    hunspellDicts.fr-reforme1990
     hunspellDicts.en_US
-    hunspellDicts.en_GB
+    hunspellDicts.en_GB-ize
 
     # Note taking
     apostrophe
@@ -175,7 +175,7 @@ in {
       "org.prismlauncher.PrismLauncher"
 
       # Programming
-      "org.gnome.Builder.Devel"
+      { appId = "org.gnome.Builder.Devel"; origin = "gnome-nightly"; }
     ];
 
     uninstallUnmanaged = true;
diff --git a/generic/user/user.nix b/general/user/user.nix
similarity index 100%
rename from generic/user/user.nix
rename to general/user/user.nix