diff --git a/resources/config b/resources/config
index f3c0a77..1c2783a 100644
--- a/resources/config
+++ b/resources/config
@@ -1,12 +1,12 @@
 {
-    // "layer": "top", // Waybar at top layer
+    "layer": "top", // Waybar at top layer
     // "position": "bottom", // Waybar position (top|bottom|left|right)
-    "height": 30, // Waybar height (to be removed for auto height)
+    // "height": 30, // Waybar height (to be removed for auto height)
     // "width": 1280, // Waybar width
     // Choose the order of the modules
-    "modules-left": ["sway/workspaces", "sway/mode", "custom/media"],
+    "modules-left": ["sway/workspaces", "sway/mode"],
     "modules-center": ["sway/window"],
-    "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "sway/language", "battery", "battery#bat2", "clock", "tray"],
+    "modules-right": ["pulseaudio", "network", "cpu", "memory", "battery", "custom/clock", "sway/language", "tray"],
     // Modules configuration
     // "sway/workspaces": {
     //     "disable-scroll": true,
@@ -26,6 +26,9 @@
     "sway/mode": {
         "format": "<span style=\"italic\">{}</span>"
     },
+    "sway/window": {
+        "max-length": 40
+    },
     "mpd": {
         "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ ",
         "format-disconnected": "Disconnected ",
@@ -60,14 +63,9 @@
         }
     },
     "tray": {
-        // "icon-size": 21,
+        "icon-size": 24,
         "spacing": 10
     },
-    "clock": {
-        // "timezone": "America/New_York",
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        "format-alt": "{:%Y-%m-%d}"
-    },
     "cpu": {
         "format": "{usage}% ",
         "tooltip": false
@@ -132,6 +130,16 @@
         },
         "on-click": "pavucontrol"
     },
+    "bluetooth": {
+        "format": " {icon} ",
+        "format-alt": " bluetooth: {status} ",
+        "interval": 30,
+        "format-icons": {
+                "enabled": "",
+                "disabled": ""
+        },
+        "tooltip-format": "{status}"
+    },
     "custom/media": {
         "format": "{icon} {}",
         "return-type": "json",
@@ -143,5 +151,20 @@
         "escape": true,
         "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
         // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
+    },
+    "custom/clock": {
+        "return-type": "json",
+        "format": " {} ",
+        "exec": "/usr/libexec/waybar/clock.py '%H:%M'"
+    },
+    "custom/xkb-layout": {
+        "return-type": "json",
+        "format": " {} ",
+        //"format-icons": {
+        //    "English (US)": "En",
+        //    "Russian":      "Ru",
+        //    "default":      "??"
+        //},
+        "exec": "/usr/libexec/waybar/xkb-layout.py"
     }
 }
diff --git a/resources/style.css b/resources/style.css
index 920bb52..b9147d9 100644
--- a/resources/style.css
+++ b/resources/style.css
@@ -74,6 +74,8 @@ window#waybar.chromium {
 #network,
 #pulseaudio,
 #custom-media,
+#custom-clock,
+#bluetooth,
 #tray,
 #mode,
 #idle_inhibitor,
@@ -98,6 +100,7 @@ window#waybar.chromium {
     margin-right: 0;
 }
 
+#custom-clock,
 #clock {
     background-color: #64727D;
 }
@@ -164,6 +167,14 @@ label:focus {
     color: #2a5c45;
 }
 
+#bluetooth {
+    background-color: #022edd;
+}
+
+#custom-xkb-layout {
+    background-color: #ba5137;
+}
+
 #custom-media {
     background-color: #66cc99;
     color: #2a5c45;
@@ -216,9 +227,11 @@ label:focus {
     background-color: #51a37a;
 }
 
+#custom-xkb-layout,
 #language {
-    background: #00b093;
-    color: #740864;
+    /* background: #00b093; */
+    background-color: #ba5137;
+    color: #fff;
     padding: 0 5px;
     margin: 0 5px;
     min-width: 16px;