diff --git a/modules/bar/states/Apps/AppsState.qml b/modules/bar/states/Apps/AppsState.qml
index 254976d..24fa4da 100644
--- a/modules/bar/states/Apps/AppsState.qml
+++ b/modules/bar/states/Apps/AppsState.qml
@@ -67,45 +67,69 @@ Item {
     }
 
     readonly property var iconMap: ({
+        // Youtube
         "grayjay":                  "",
+        // Browser
         "ablaze floorp":            "",
         "floorp":                   "",
         "librewolf":                "",
         "midori":                   "",
         "brave-browser":            "",
         "chromium":                 "",
-        "org.mozilla.thunderbird":  "󰇮",
+        // E-Mail
+        "*thunderbird":  "󰇮",
+        // Terminals
         "kitty":                    "",
         "alacritty":                "",
+        // Videoplayer
         "vlc media player":         "󰕼",
         "mpv":                      "",
         "ffplay":                   "",
+        // Video editing
         "org.kde.kdenlive":         "",
+        // Video
+        "*obs*":                    "󰨜",
+        "hyprland-share-picker":    "󱎴",
+        // Chats
         "discord":                  "",
         "vesktop":                  "",
         "signal":                   "󰭹",
         "xyz.chatboxapp.app":       "",
+        // Coding
         "visual studio code":       "",
         "vscodium":                 "",
         "jetbrains-idea":           "",
         "jetbrains-studio":         "",
+        // Text Editor
         "org.xfce.mousepad":        "󱩼",
+        // Password
         "org.keepassxc.keepassxc":  "",
         "yubico authenticator":     "",
+        // Cloud
         "com.nextcloud*":           "󰅟",
+        // App Store
         "octopi":                   "󰒚",
+        // Games
         "steam*":                   "",
         "org.prismlauncher*":       "󰍳",
         "minecraft*":               "󰍳",
         "game":                     "",
+        "eden*":                     "",
+        // Digital Arts
         "blender":                  "",
+        // Image Editor
+        "gimp":                     "󱇣",
+        "*inkscape*":               "󱇣",
         "krita":                    "",
+        // VM
         "virt*":                    "",
         "remote-viewer":            "",
+        // Audio
         "qpwgraph":                 "󱡫",
         "carla":                    "󱡫",
-        "com.obsproject.studio":    "󰨜",
-        "hyprland-share-picker":    "󱎴",
+        "volume*":                  "",
+        "pavucontrol":              "",
+        // Document Editor/Viewer
         "libreoffice-startcenter":  "",
         "libreoffice-base":         "",
         "libreoffice-calc":         "󱎏",
@@ -116,39 +140,49 @@ Item {
         "*rnote":                   "󱩼",
         "xreader":                  "󱩼",
         "*xournalpp*":              "󱩼",
-        "qpdfview.local.qpdfview":  "󱩼",
+        "qpdfview*":  "󱩼",
+        // Hardware
         "mission center":           "",
         "qdirstat":                 "󰋊",
         "disks":                    "󰋊",
+        // File Manager
         "nemo":                     "󰉋",
         "org.gnome.nautilus":       "󰉋",
         "org.kde.dolphin":          "󰉋",
         "xdg-desktop-portal-gtk":   "󰉋",
+        // Settings
         "nwg-look":                 "",
         "qt5ct":                    "",
         "qt6ct":                    "",
         "sddm-conf":                "",
+        "org.gnome.Settings":       "",
         "blueman*":                 "󰂯",
         "nm-connection-editor":     "󱛆",
+        "nm-applet":                "󱛆",
+        // Calculator
         "calculator":               "󰪚",
+        // VPN
         "*vpn":                     "󰳌",
         "*cisco*":                  "󰳌",
+        // Torrent
         "*qbittorrent*":            "󰉍",
+        // Hardware Design
         "xilinx*":                  "",
         "vsim":                     "",
         "*ivado*":                  "",
+        // BoxBuddy
         "*boxbuddy*":               "󰒋",
+        // Stream
         "fladder":                  "󰼁",
         "crunchyroll":              "",
         "netflix":                  "",
         "primevideo":               "󰯜",
+        // Image Viewer
         "viewnior":                 "",
-        "gimp":                     "󱇣",
-        "*inkscape*":               "󱇣",
+        // CNC
         "lightburn":                "󱇣",
         "wofi":                     "",
-        "org.gnome.Settings":       "",
-        "pavucontrol":              "",
-        "nm-applet":                "󱛆"
+        // Screenshare
+        "moonlight":                "󰍹ßß"
     })
 }