diff --git a/src/overlay_resources/keyboard/KeyBtn.tscn b/src/overlay_resources/keyboard/KeyBtn.tscn
index 9dace5c..39de05d 100644
--- a/src/overlay_resources/keyboard/KeyBtn.tscn
+++ b/src/overlay_resources/keyboard/KeyBtn.tscn
@@ -9,4 +9,3 @@ rect_min_size = Vector2( 128, 128 )
 anchor_right = 1.0
 anchor_bottom = 1.0
 align = 1
-valign = 1
diff --git a/src/overlay_resources/keyboard/keyboard.theme b/src/overlay_resources/keyboard/keyboard.theme
index f0b3419..a24fd02 100644
Binary files a/src/overlay_resources/keyboard/keyboard.theme and b/src/overlay_resources/keyboard/keyboard.theme differ
diff --git a/src/overlay_resources/keyboard/keyboard_overlay.gd b/src/overlay_resources/keyboard/keyboard_overlay.gd
index 0a2e757..ae83abb 100644
--- a/src/overlay_resources/keyboard/keyboard_overlay.gd
+++ b/src/overlay_resources/keyboard/keyboard_overlay.gd
@@ -42,35 +42,22 @@ func apply_keys():
 				
 			row_box.add_child(btn)
 			btn.connect("pressed", self, "key_pressed", [key.keycode])
-		#TODO gaps
+			
+			# horizontal gaps
+			if key.has("gap"):
+				var gapbox = Control.new()
+				gapbox.rect_min_size.x = key.gap * key_size
+				gapbox.name = "Gap"
+				row_box.add_child(gapbox)
+		# vertical gaps
+		if row.has("gap"):
+			var gapbox = Control.new()
+			gapbox.rect_min_size.y = row.gap * key_size
+			gapbox.name = "Gap"
+			$PanelContainer/CenterContainer/VBoxContainer.add_child(gapbox)
 
 
 func key_pressed(code, toggle=false):
 	GDVK.press(code)
 	
 
-
-func _on_KeyO_pressed():
-	GDVK.press("O")
-
-
-func _on_KeyE_pressed():
-	GDVK.key_down("SHIFT")
-	GDVK.press("1")
-	GDVK.key_up("SHIFT")
-	
-
-
-func _on_KeyH_pressed():
-	GDVK.press("H")
-	pass # Replace with function body.
-
-
-func _on_KeyL_pressed():
-	GDVK.press("L")
-	pass # Replace with function body.
-
-
-func _on_KeyCaps_pressed():
-	GDVK.press("CAPSLOCK")
-	pass # Replace with function body.
diff --git a/src/overlay_resources/keyboard/layouts/layout_se.json b/src/overlay_resources/keyboard/layouts/layout_se.json
index b21e86a..62e73ba 100644
--- a/src/overlay_resources/keyboard/layouts/layout_se.json
+++ b/src/overlay_resources/keyboard/layouts/layout_se.json
@@ -267,8 +267,8 @@
 				},
 				{
 					"keycode": "SHIFT",
-					"display": "SHIFT",
-					"width": 2.5
+					"display": "Shift",
+					"width": 2.75
 				}
 			]
 		},
@@ -282,28 +282,28 @@
 				},
 				{
 					"keycode": "SUPER",
-					"display": "Super",
-					"width": 1.5
+					"display": "Sup",
+					"width": 1.25
 				},
 				{
 					"keycode": "ALT",
 					"display": "Alt",
-					"width": 1.5
+					"width": 1.25
 				},
 				{
 					"keycode": "SPACE",
 					"display": "",
-					"width": 5.5
+					"width": 5.75
 				},
 				{
 					"keycode": "ALT",
-					"display": "Alt Gr(!)",
-					"width": 1.5
+					"display": "Alt",
+					"width": 1.25
 				},
 				{
 					"keycode": "SUPER",
-					"display": "Super",
-					"width": 1.5
+					"display": "Sup",
+					"width": 1.25
 				},
 				{
 					"keycode": "MENU",
diff --git a/src/overlays/KeyboardOverlay.tscn b/src/overlays/KeyboardOverlay.tscn
index 93e14d1..ce3e950 100644
--- a/src/overlays/KeyboardOverlay.tscn
+++ b/src/overlays/KeyboardOverlay.tscn
@@ -17,8 +17,10 @@ key_row = ExtResource( 3 )
 key_button = ExtResource( 4 )
 
 [node name="PanelContainer" type="PanelContainer" parent="."]
-anchor_right = 1.0
+margin_right = 1024.0
 margin_bottom = 16.0
+size_flags_horizontal = 0
+size_flags_vertical = 0
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -26,9 +28,12 @@ __meta__ = {
 [node name="CenterContainer" type="CenterContainer" parent="PanelContainer"]
 margin_left = 8.0
 margin_top = 8.0
-margin_right = 2040.0
+margin_right = 1016.0
 margin_bottom = 8.0
 
 [node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/CenterContainer"]
-margin_left = 1016.0
-margin_right = 1016.0
+margin_left = 504.0
+margin_right = 504.0
+size_flags_horizontal = 0
+size_flags_vertical = 0
+alignment = 1