diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f0cd5e46..6c1bef2a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -41,7 +41,7 @@ repos:
         args:
           # Remember also: --no-sort-keys
           # ASCII excludes the älphäbet amongst others
-          [--autofix, --no-ensure-ascii]
+          [--autofix, --no-ensure-ascii, --top-keys, "Name,name"]
 
   # Markdown Table of Contents generation.
   - repo: https://github.com/thlorenz/doctoc
diff --git a/conf/kdeconnect-remote-commands-export.json b/conf/kdeconnect-remote-commands-export.json
index 1cf336fb..c7417425 100644
--- a/conf/kdeconnect-remote-commands-export.json
+++ b/conf/kdeconnect-remote-commands-export.json
@@ -1,34 +1,34 @@
 [
   {
-    "command": "darkman toggle",
-    "name": "Darkman toggle"
+    "name": "Darkman toggle",
+    "command": "darkman toggle"
   },
   {
-    "command": "loginctl lock-session",
-    "name": "Lock screen"
+    "name": "Lock screen",
+    "command": "loginctl lock-session"
   },
   {
-    "command": "systemctl poweroff",
-    "name": "Power off"
+    "name": "Power off",
+    "command": "systemctl poweroff"
   },
   {
-    "command": "systemctl reboot",
-    "name": "Reboot"
+    "name": "Reboot",
+    "command": "systemctl reboot"
   },
   {
-    "command": "spectacle -b",
-    "name": "Screenshot"
+    "name": "Screenshot",
+    "command": "spectacle -b"
   },
   {
-    "command": "systemctl suspend",
-    "name": "Suspend"
+    "name": "Suspend",
+    "command": "systemctl suspend"
   },
   {
-    "command": "kdeconnect-cli -d $(kdeconnect-cli -a --id-only) --ping-msg \"$(ps -eo pid,%mem,cmd --sort=-%mem | head -n 6)\"",
-    "name": "Top#5 memory eaters"
+    "name": "Top#5 memory eaters",
+    "command": "kdeconnect-cli -d $(kdeconnect-cli -a --id-only) --ping-msg \"$(ps -eo pid,%mem,cmd --sort=-%mem | head -n 6)\""
   },
   {
-    "command": "loginctl unlock-session",
-    "name": "Unlock"
+    "name": "Unlock",
+    "command": "loginctl unlock-session"
   }
 ]
diff --git a/etc/firefox/policies/policies.json b/etc/firefox/policies/policies.json
index 5a1820a8..63994a6c 100644
--- a/etc/firefox/policies/policies.json
+++ b/etc/firefox/policies/policies.json
@@ -96,44 +96,44 @@
     "Containers": {
       "Default": [
         {
+          "name": "ff",
           "color": "white",
-          "icon": "chill",
-          "name": "ff"
+          "icon": "chill"
         },
         {
+          "name": "Fedi",
           "color": "green",
-          "icon": "tree",
-          "name": "Fedi"
+          "icon": "tree"
         },
         {
+          "name": "Git",
           "color": "pink",
-          "icon": "briefcase",
-          "name": "Git"
+          "icon": "briefcase"
         },
         {
+          "name": "Google",
           "color": "orange",
-          "icon": "chill",
-          "name": "Google"
+          "icon": "chill"
         },
         {
+          "name": "HSL",
           "color": "blue",
-          "icon": "vacation",
-          "name": "HSL"
+          "icon": "vacation"
         },
         {
+          "name": "IM",
           "color": "purple",
-          "icon": "chill",
-          "name": "IM"
+          "icon": "chill"
         },
         {
+          "name": "LinkedIn",
           "color": "cyan",
-          "icon": "briefcase",
-          "name": "LinkedIn"
+          "icon": "briefcase"
         },
         {
+          "name": "WhatsApp",
           "color": "green",
-          "icon": "pet",
-          "name": "WhatsApp"
+          "icon": "pet"
         }
       ]
     },
@@ -951,48 +951,48 @@
     "SearchEngines": {
       "Add": [
         {
+          "Name": "DuckDuckGo Lite",
           "Alias": "dl",
           "Description": "Minimal, ad-free version of DuckDuckGo",
           "IconURL": "https://start.duckduckgo.com/static-assets/favicons/DDG-icon_256x256.png",
           "Method": "POST",
-          "Name": "DuckDuckGo Lite",
           "PostData": "q={searchTerms}",
           "SuggestURLTemplate": "https://start.duckduckgo.com/ac/?q={searchTerms}&type=list",
           "URLTemplate": "https://duckduckgo.com/lite/?q={searchTerms}"
         },
         {
+          "Name": "DuckDuckGo Start",
           "Alias": "d",
           "Description": "DuckDuckGo Start page version",
           "IconURL": "https://start.duckduckgo.com/static-assets/favicons/DDG-icon_256x256.png",
           "Method": "GET",
-          "Name": "DuckDuckGo Start",
           "SuggestURLTemplate": "https://start.duckduckgo.com/ac/?q={searchTerms}&type=list",
           "URLTemplate": "https://start.duckduckgo.com/?q={searchTerms}"
         },
         {
+          "Name": "Ecosia",
           "Alias": "e",
           "Description": "Ecosia Search Engine",
           "IconURL": "https://cdn-static.ecosia.org/static/icons/favicon.ico",
           "Method": "GET",
-          "Name": "Ecosia",
           "SuggestURLTemplate": "https://ac.ecosia.org/autocomplete?q={searchTerms}",
           "URLTemplate": "https://www.ecosia.org/search?q={searchTerms}&addon=firefoxgpo"
         },
         {
+          "Name": "Brave Search",
           "Alias": "b",
           "Description": "Brave Search",
           "IconURL": "https://cdn.search.brave.com/serp/v2/_app/immutable/assets/favicon.acxxetWH.ico",
           "Method": "GET",
-          "Name": "Brave Search",
           "SuggestURLTemplate": "https://search.brave.com/api/suggest?q={searchTerms}",
           "URLTemplate": "https://search.brave.com/search?q={searchTerms}"
         },
         {
+          "Name": "Brave Search Goggles",
           "Alias": "bg",
           "Description": "Brave Search Goggles",
           "IconURL": "https://cdn.search.brave.com/serp/v2/_app/immutable/assets/favicon.acxxetWH.ico",
           "Method": "GET",
-          "Name": "Brave Search Goggles",
           "SuggestURLTemplate": "https://search.brave.com/api/suggest?q={searchTerms}",
           "URLTemplate": "https://search.brave.com/goggles?q={searchTerms}"
         }