Merge branch 'quattro' into unified-input-method-setup

# Conflicts:
#	config/omarchy/shell.json

config/omarchy/shell.json

@@ -21,15 +21,15 @@
         {
           "id": "omarchy.indicators"
         },
-        {
-          "id": "omarchy.elsewhen"
-        },
         {
           "id": "omarchy.clock",
           "format": "dddd HH:mm",
           "formatAlt": "d MMMM 'W'ww yyyy",
           "verticalFormat": "HH\n\u2014\nmm"
         },
+        {
+          "id": "omarchy.elsewhen"
+        },
         {
           "id": "omarchy.weather"
         },