diff --git a/.config/waybar/config b/.config/waybar/config
index 0d58b01..63ae74e 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -5,7 +5,7 @@
   // Choose the order of the modules
   "modules-left": ["sway/workspaces", "sway/mode", "sway/window"],
   "modules-center": [],
-  "modules-right": ["network", "battery", "pulseaudio", "cpu", "temperature", "clock", "tray"],
+  "modules-right": ["network", "battery", "pulseaudio", "backlight", "cpu", "memory", "temperature", "custom/layout", "clock", "tray"],
   // Module config
   "sway/mode": {
     "tooltip": false,
@@ -45,6 +45,11 @@
     // "format-full": ""
     // "format-icons": ["", "", "", "", "", "", ""]
   },
+  "backlight": {
+    "device": "amdgpu_bl0",
+    "format": "{icon} {percent}%",
+    "format-icons": ["", ""]
+  },
   "pulseaudio": {
     "tooltip": true,
     "scroll-step": 1, // %, can be a float
@@ -60,8 +65,8 @@
         "phone": "",
         "portable": "",
         "car": "",
-        // 
-        "default": [""]
+        // 
+        "default": [""]
     },
     "on-click": "pavucontrol"
   },
@@ -70,13 +75,21 @@
     "tooltip": false,
     "format": " {usage}%"
   },
+  "memory": {
+    "format": " {}%"
+  },
+  "custom/layout": {
+    "exec": "~/.config/waybar/keyboard-layout.py",
+    "return-type": "json",
+    "format": "| <span color='#ef9f33'>{}</span>"
+  },
   "clock": {
     "tooltip": false,
     "format": "| {:%d.%m.%Y %H:%M}"
   },
   "tray": {
     "tooltip": false,
-    // "icon-size": 21,
-    "spacing": 10
+    "icon-size": 18,
+    "spacing": 5
   }
 }
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index cf11684..ecd2b89 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -44,14 +44,14 @@ window#waybar.solo {
 #workspaces button {
     padding: 0 5px;
     background-color: transparent;
-    border-bottom: 2px solid rgba(100, 114, 125, 0.5);
+    border-bottom: 2px solid rgba(180, 14, 25, 0.5);
     color: #999999;
 }
 
 #workspaces button.focused {
   color: #ffffff;
     background-color: #333333;
-    border-bottom: 2px solid #00ff96;
+    border-bottom: 2px solid #ff9600;
 }
 
 #workspaces button.urgent {
@@ -72,7 +72,7 @@ window#waybar.solo {
     padding: 0 5px;
     margin: 0 4px;
     background-color: transparent;
-    border-bottom: 2px solid #00ff96;
+    border-bottom: 2px solid #bdbd45;
     color: #ffffff;
 }