diff --git a/Main.tscn b/Main.tscn
index d6e7c2d..12451ea 100644
--- a/Main.tscn
+++ b/Main.tscn
@@ -147,7 +147,7 @@ margin_right = 1010.0
 
 [node name="FileMenu" type="MenuButton" parent="MenuAndUI/MenuContainer/MenuItems"]
 margin_right = 31.0
-margin_bottom = 21.0
+margin_bottom = 23.0
 mouse_default_cursor_shape = 2
 text = "File"
 switch_on_hover = true
@@ -155,7 +155,7 @@ switch_on_hover = true
 [node name="EditMenu" type="MenuButton" parent="MenuAndUI/MenuContainer/MenuItems"]
 margin_left = 35.0
 margin_right = 68.0
-margin_bottom = 21.0
+margin_bottom = 23.0
 mouse_default_cursor_shape = 2
 text = "Edit"
 switch_on_hover = true
@@ -163,7 +163,7 @@ switch_on_hover = true
 [node name="ViewMenu" type="MenuButton" parent="MenuAndUI/MenuContainer/MenuItems"]
 margin_left = 72.0
 margin_right = 110.0
-margin_bottom = 21.0
+margin_bottom = 23.0
 mouse_default_cursor_shape = 2
 text = "View"
 switch_on_hover = true
@@ -171,7 +171,7 @@ switch_on_hover = true
 [node name="HelpMenu" type="MenuButton" parent="MenuAndUI/MenuContainer/MenuItems"]
 margin_left = 114.0
 margin_right = 151.0
-margin_bottom = 21.0
+margin_bottom = 23.0
 mouse_default_cursor_shape = 2
 text = "Help"
 switch_on_hover = true
@@ -348,9 +348,9 @@ custom_constants/separation = 8
 alignment = 1
 
 [node name="ColorPickersCenter" type="CenterContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions"]
-margin_top = 35.0
+margin_top = 59.0
 margin_right = 208.0
-margin_bottom = 67.0
+margin_bottom = 91.0
 
 [node name="ColorPickersHorizontal" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ColorPickersCenter"]
 margin_left = 27.0
@@ -406,13 +406,13 @@ flat = true
 color = Color( 1, 1, 1, 1 )
 
 [node name="HSeparator" type="HSeparator" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions"]
-margin_top = 75.0
+margin_top = 99.0
 margin_right = 208.0
-margin_bottom = 79.0
+margin_bottom = 103.0
 
 [node name="LeftToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions"]
 editor/display_folded = true
-margin_top = 87.0
+margin_top = 111.0
 margin_right = 208.0
 margin_bottom = 242.0
 
@@ -425,7 +425,7 @@ align = 1
 [node name="LeftIndicatorCheckbox" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions"]
 margin_top = 19.0
 margin_right = 208.0
-margin_bottom = 43.0
+margin_bottom = 35.0
 hint_tooltip = "LEFT_INDIC_HT"
 mouse_default_cursor_shape = 2
 pressed = true
@@ -433,9 +433,9 @@ text = "Left pixel indicator"
 
 [node name="LeftBrushType" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions"]
 editor/display_folded = true
-margin_top = 47.0
+margin_top = 39.0
 margin_right = 208.0
-margin_bottom = 79.0
+margin_bottom = 71.0
 
 [node name="LeftBrushTypeButton" type="TextureButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftBrushType"]
 margin_right = 36.0
@@ -462,20 +462,20 @@ text = "Brush: Pixel"
 
 [node name="LeftBrushSize" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions"]
 editor/display_folded = true
-margin_top = 83.0
+margin_top = 75.0
 margin_right = 208.0
-margin_bottom = 108.0
+margin_bottom = 92.0
 
 [node name="BrushSizeLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftBrushSize"]
-margin_top = 5.0
+margin_top = 1.0
 margin_right = 58.0
-margin_bottom = 20.0
+margin_bottom = 16.0
 text = "Brush size:"
 
 [node name="LeftBrushSizeEdit" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftBrushSize"]
 margin_left = 62.0
-margin_right = 124.0
-margin_bottom = 25.0
+margin_right = 126.0
+margin_bottom = 17.0
 mouse_default_cursor_shape = 2
 min_value = 1.0
 value = 1.0
@@ -556,9 +556,9 @@ hint_tooltip = "LDAMOUNT_HT"
 value = 10.0
 
 [node name="LeftMirroring" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions"]
-margin_top = 112.0
+margin_top = 96.0
 margin_right = 208.0
-margin_bottom = 155.0
+margin_bottom = 131.0
 
 [node name="Label" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftMirroring"]
 margin_right = 208.0
@@ -568,19 +568,19 @@ text = "Mirroring"
 [node name="LeftMirrorButtons" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftMirroring"]
 margin_top = 19.0
 margin_right = 208.0
-margin_bottom = 43.0
+margin_bottom = 35.0
 
 [node name="LeftHorizontalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftMirroring/LeftMirrorButtons"]
-margin_right = 85.0
-margin_bottom = 24.0
+margin_right = 77.0
+margin_bottom = 16.0
 hint_tooltip = "HORIZMIRROR_HT"
 mouse_default_cursor_shape = 2
 text = "Horizontal"
 
 [node name="LeftVerticalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions/LeftMirroring/LeftMirrorButtons"]
-margin_left = 89.0
-margin_right = 158.0
-margin_bottom = 24.0
+margin_left = 81.0
+margin_right = 142.0
+margin_bottom = 16.0
 hint_tooltip = "VERTMIRROR_HT"
 mouse_default_cursor_shape = 2
 text = "Vertical"
@@ -594,7 +594,7 @@ margin_bottom = 254.0
 editor/display_folded = true
 margin_top = 262.0
 margin_right = 208.0
-margin_bottom = 417.0
+margin_bottom = 393.0
 
 [node name="RightLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions"]
 margin_right = 208.0
@@ -605,16 +605,16 @@ align = 1
 [node name="RightIndicatorCheckbox" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions"]
 margin_top = 19.0
 margin_right = 208.0
-margin_bottom = 43.0
+margin_bottom = 35.0
 hint_tooltip = "RIGHT_INDIC_HT"
 mouse_default_cursor_shape = 2
 text = "Right pixel indicator"
 
 [node name="RightBrushType" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions"]
 editor/display_folded = true
-margin_top = 47.0
+margin_top = 39.0
 margin_right = 208.0
-margin_bottom = 79.0
+margin_bottom = 71.0
 
 [node name="RightBrushTypeButton" type="TextureButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightBrushType"]
 margin_right = 36.0
@@ -641,20 +641,20 @@ text = "Brush: Pixel"
 
 [node name="RightBrushSize" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions"]
 editor/display_folded = true
-margin_top = 83.0
+margin_top = 75.0
 margin_right = 208.0
-margin_bottom = 108.0
+margin_bottom = 92.0
 
 [node name="BrushSizeLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightBrushSize"]
-margin_top = 5.0
+margin_top = 1.0
 margin_right = 58.0
-margin_bottom = 20.0
+margin_bottom = 16.0
 text = "Brush size:"
 
 [node name="RightBrushSizeEdit" type="SpinBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightBrushSize"]
 margin_left = 62.0
-margin_right = 124.0
-margin_bottom = 25.0
+margin_right = 126.0
+margin_bottom = 17.0
 mouse_default_cursor_shape = 2
 min_value = 1.0
 value = 1.0
@@ -736,9 +736,9 @@ value = 10.0
 
 [node name="RightMirroring" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions"]
 editor/display_folded = true
-margin_top = 112.0
+margin_top = 96.0
 margin_right = 208.0
-margin_bottom = 155.0
+margin_bottom = 131.0
 
 [node name="Label" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightMirroring"]
 margin_right = 208.0
@@ -748,19 +748,19 @@ text = "Mirroring"
 [node name="RightMirrorButtons" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightMirroring"]
 margin_top = 19.0
 margin_right = 208.0
-margin_bottom = 43.0
+margin_bottom = 35.0
 
 [node name="RightHorizontalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightMirroring/RightMirrorButtons"]
-margin_right = 85.0
-margin_bottom = 24.0
+margin_right = 77.0
+margin_bottom = 16.0
 hint_tooltip = "HORIZMIRROR_HT"
 mouse_default_cursor_shape = 2
 text = "Horizontal"
 
 [node name="RightVerticalMirroring" type="CheckBox" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions/RightMirroring/RightMirrorButtons"]
-margin_left = 89.0
-margin_right = 158.0
-margin_bottom = 24.0
+margin_left = 81.0
+margin_right = 142.0
+margin_bottom = 16.0
 hint_tooltip = "VERTMIRROR_HT"
 mouse_default_cursor_shape = 2
 text = "Vertical"
@@ -898,32 +898,32 @@ margin_left = 15.0
 margin_top = 4.0
 
 [node name="TimelineContainer" type="VBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer"]
-margin_right = 562.0
-margin_bottom = 139.0
+margin_right = 570.0
+margin_bottom = 138.0
 size_flags_horizontal = 3
 
 [node name="AnimationButtons" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer"]
-margin_right = 562.0
-margin_bottom = 25.0
+margin_right = 570.0
+margin_bottom = 24.0
 rect_min_size = Vector2( 0, 24 )
 
 [node name="CurrentFrame" type="Label" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons"]
-margin_top = 5.0
-margin_right = 234.0
-margin_bottom = 20.0
+margin_top = 4.0
+margin_right = 237.0
+margin_bottom = 19.0
 size_flags_horizontal = 3
 text = "Current frame: 1/1"
 
 [node name="PlaybackButtons" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons"]
 editor/display_folded = true
-margin_left = 238.0
-margin_right = 378.0
-margin_bottom = 25.0
+margin_left = 241.0
+margin_right = 381.0
+margin_bottom = 24.0
 size_flags_horizontal = 2
 
 [node name="FirstFrame" type="TextureButton" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons"]
 margin_right = 20.0
-margin_bottom = 25.0
+margin_bottom = 24.0
 hint_tooltip = "FIRSTFRAME_HT"
 mouse_default_cursor_shape = 2
 shortcut_in_tooltip = false
@@ -933,7 +933,7 @@ texture_normal = ExtResource( 19 )
 [node name="PreviousFrame" type="TextureButton" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons"]
 margin_left = 24.0
 margin_right = 44.0
-margin_bottom = 25.0
+margin_bottom = 24.0
 hint_tooltip = "PREVIOUSFRAME_HT"
 mouse_default_cursor_shape = 2
 shortcut_in_tooltip = false
@@ -943,7 +943,7 @@ texture_normal = ExtResource( 20 )
 [node name="PlayBackwards" type="TextureButton" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons"]
 margin_left = 48.0
 margin_right = 68.0
-margin_bottom = 25.0
+margin_bottom = 24.0
 hint_tooltip = "PLAYBACKWARDS_HT"
 mouse_default_cursor_shape = 2
 toggle_mode = true
@@ -955,7 +955,7 @@ texture_pressed = ExtResource( 22 )
 [node name="PlayForward" type="TextureButton" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons"]
 margin_left = 72.0
 margin_right = 92.0
-margin_bottom = 25.0
+margin_bottom = 24.0
 hint_tooltip = "PLAYFORWARD_HT"
 mouse_default_cursor_shape = 2
 size_flags_horizontal = 0
@@ -968,7 +968,7 @@ texture_pressed = ExtResource( 22 )
 [node name="NextFrame" type="TextureButton" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons"]
 margin_left = 96.0
 margin_right = 116.0
-margin_bottom = 25.0
+margin_bottom = 24.0
 hint_tooltip = "NEXTFRAME_HT"
 mouse_default_cursor_shape = 2
 shortcut_in_tooltip = false
@@ -978,7 +978,7 @@ texture_normal = ExtResource( 24 )
 [node name="LastFrame" type="TextureButton" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/PlaybackButtons"]
 margin_left = 120.0
 margin_right = 140.0
-margin_bottom = 25.0
+margin_bottom = 24.0
 hint_tooltip = "LASTFRAME_HT"
 mouse_default_cursor_shape = 2
 shortcut_in_tooltip = false
@@ -986,14 +986,14 @@ shortcut = SubResource( 17 )
 texture_normal = ExtResource( 25 )
 
 [node name="LoopButtons" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons"]
-margin_left = 476.0
-margin_right = 562.0
-margin_bottom = 25.0
+margin_left = 482.0
+margin_right = 570.0
+margin_bottom = 24.0
 size_flags_horizontal = 0
 
 [node name="FPSValue" type="SpinBox" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/LoopButtons"]
-margin_right = 62.0
-margin_bottom = 25.0
+margin_right = 64.0
+margin_bottom = 24.0
 hint_tooltip = "FPS_HT"
 mouse_default_cursor_shape = 2
 min_value = 0.1
@@ -1002,35 +1002,35 @@ value = 6.0
 suffix = "FPS"
 
 [node name="LoopAnim" type="TextureButton" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/AnimationButtons/LoopButtons"]
-margin_left = 66.0
-margin_right = 86.0
-margin_bottom = 25.0
+margin_left = 68.0
+margin_right = 88.0
+margin_bottom = 24.0
 hint_tooltip = "No loop"
 mouse_default_cursor_shape = 2
 texture_normal = ExtResource( 26 )
 
 [node name="HSeparator" type="HSeparator" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer"]
-margin_top = 29.0
-margin_right = 562.0
-margin_bottom = 33.0
+margin_top = 28.0
+margin_right = 570.0
+margin_bottom = 32.0
 
 [node name="TimelineSeconds" type="Control" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer"]
-margin_top = 37.0
-margin_right = 562.0
-margin_bottom = 53.0
+margin_top = 36.0
+margin_right = 570.0
+margin_bottom = 52.0
 rect_min_size = Vector2( 0, 16 )
 script = ExtResource( 27 )
 
 [node name="HSeparator2" type="HSeparator" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer"]
-margin_top = 57.0
-margin_right = 562.0
-margin_bottom = 61.0
+margin_top = 56.0
+margin_right = 570.0
+margin_bottom = 60.0
 
 [node name="FrameAndButtonContainer" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer"]
 editor/display_folded = true
-margin_top = 65.0
-margin_right = 562.0
-margin_bottom = 101.0
+margin_top = 64.0
+margin_right = 570.0
+margin_bottom = 100.0
 
 [node name="AddFrame" type="TextureButton" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/FrameAndButtonContainer"]
 margin_right = 36.0
@@ -1042,7 +1042,7 @@ texture_normal = ExtResource( 28 )
 
 [node name="ScrollContainer" type="ScrollContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/FrameAndButtonContainer"]
 margin_left = 40.0
-margin_right = 562.0
+margin_right = 570.0
 margin_bottom = 36.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
@@ -1051,56 +1051,56 @@ scroll_vertical_enabled = false
 [node name="FrameContainer" type="HBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/TimelineContainer/FrameAndButtonContainer/ScrollContainer"]
 
 [node name="VSeparator" type="VSeparator" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer"]
-margin_left = 566.0
-margin_right = 570.0
-margin_bottom = 139.0
+margin_left = 574.0
+margin_right = 578.0
+margin_bottom = 138.0
 
 [node name="OnionSkinningButtons" type="VBoxContainer" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer"]
 editor/display_folded = true
-margin_left = 574.0
+margin_left = 582.0
 margin_right = 681.0
-margin_bottom = 139.0
+margin_bottom = 138.0
 
 [node name="OnionSkinning" type="Label" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons"]
-margin_right = 107.0
+margin_right = 99.0
 margin_bottom = 15.0
 text = "Onion Skinning:"
 
 [node name="OnionSkinningPast" type="Label" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons"]
 margin_top = 19.0
-margin_right = 107.0
+margin_right = 99.0
 margin_bottom = 34.0
 text = "Past Frames"
 
 [node name="PastOnionSkinning" type="SpinBox" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons"]
 margin_top = 38.0
-margin_right = 107.0
-margin_bottom = 63.0
+margin_right = 99.0
+margin_bottom = 55.0
 mouse_default_cursor_shape = 2
 
 [node name="OnionSkinningFuture" type="Label" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons"]
-margin_top = 67.0
-margin_right = 107.0
-margin_bottom = 82.0
+margin_top = 59.0
+margin_right = 99.0
+margin_bottom = 74.0
 text = "Future Frames"
 
 [node name="FutureOnionSkinning" type="SpinBox" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons"]
-margin_top = 86.0
-margin_right = 107.0
-margin_bottom = 111.0
+margin_top = 78.0
+margin_right = 99.0
+margin_bottom = 95.0
 mouse_default_cursor_shape = 2
 
 [node name="BlueRedMode" type="CheckBox" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer/OnionSkinningButtons"]
-margin_top = 115.0
-margin_right = 107.0
-margin_bottom = 139.0
+margin_top = 99.0
+margin_right = 99.0
+margin_bottom = 115.0
 mouse_default_cursor_shape = 2
 text = "Blue-Red Mode"
 
 [node name="VSeparator2" type="VSeparator" parent="MenuAndUI/UI/CanvasAndTimeline/AnimationTimeline/AnimationContainer"]
 margin_left = 685.0
 margin_right = 689.0
-margin_bottom = 139.0
+margin_bottom = 138.0
 
 [node name="LayerPanel" type="Panel" parent="MenuAndUI/UI"]
 editor/display_folded = true
@@ -1337,10 +1337,10 @@ hint_tooltip = "Pixel brush"
 visible = false
 anchor_right = 1.0
 anchor_bottom = 1.0
-margin_left = 4.0
-margin_top = 33.0
-margin_right = -4.0
-margin_bottom = -4.0
+margin_left = 5.0
+margin_top = 39.0
+margin_right = -5.0
+margin_bottom = -5.0
 rect_min_size = Vector2( 0, 36 )
 size_flags_horizontal = 3
 scroll_horizontal_enabled = false
@@ -1371,7 +1371,7 @@ margin_bottom = 70.0
 margin_left = 8.0
 margin_top = 8.0
 margin_right = 192.0
-margin_bottom = 33.0
+margin_bottom = 31.0
 
 [node name="ImageSize" type="Label" parent="CreateNewImage/VBoxContainer"]
 margin_right = 184.0
@@ -1492,7 +1492,7 @@ margin_bottom = 114.0
 margin_left = 8.0
 margin_top = 8.0
 margin_right = 192.0
-margin_bottom = 77.0
+margin_bottom = 75.0
 
 [node name="ImageSize" type="Label" parent="ScaleImage/VBoxContainer"]
 margin_right = 184.0
@@ -1565,7 +1565,7 @@ anchor_right = 0.5
 margin_left = -92.0
 margin_top = 8.0
 margin_right = 92.0
-margin_bottom = 33.0
+margin_bottom = 31.0
 
 [node name="OptionsContainer" type="GridContainer" parent="PreferencesDialog/VBoxContainer"]
 margin_right = 195.0
@@ -1583,7 +1583,7 @@ margin_left = 57.0
 margin_right = 195.0
 margin_bottom = 21.0
 text = "System Language"
-items = [ "System Language", null, false, 0, null, "German [de]", null, false, 1, null, "Greek [el]", null, false, 2, null, "English [en]", null, false, 3, null, "French [fr]", null, false, 4, null ]
+items = [ "System Language", null, false, 0, null, "Deutsch [de]", null, false, 1, null, "Ελληνικά [el]", null, false, 2, null, "English [en]", null, false, 3, null, "Français [fr]", null, false, 4, null, "Polski [pl]", null, false, 5, null ]
 selected = 0
 
 [node name="GridOptionsLabel" type="Label" parent="PreferencesDialog/VBoxContainer"]
@@ -1653,7 +1653,7 @@ script = ExtResource( 43 )
 margin_left = 8.0
 margin_top = 8.0
 margin_right = 276.0
-margin_bottom = 149.0
+margin_bottom = 147.0
 
 [node name="Pixelorama" type="Label" parent="AboutDialog/AboutUI"]
 margin_right = 268.0
@@ -1679,7 +1679,7 @@ margin_bottom = 77.0
 editor/display_folded = true
 margin_left = 37.0
 margin_right = 231.0
-margin_bottom = 21.0
+margin_bottom = 23.0
 
 [node name="Website" type="Button" parent="AboutDialog/AboutUI/Links/LinkButtons"]
 margin_right = 55.0
@@ -1719,7 +1719,6 @@ window_title = "Error!"
 dialog_text = "This is an error message!"
 
 [node name="EditPalettePopup" type="WindowDialog" parent="."]
-visible = true
 margin_right = 600.0
 margin_bottom = 550.0
 rect_min_size = Vector2( 600, 550 )
@@ -1737,17 +1736,19 @@ size_flags_horizontal = 3
 
 [node name="HBoxContainer" type="HBoxContainer" parent="EditPalettePopup/VBoxContainer"]
 margin_right = 580.0
-margin_bottom = 476.0
+margin_bottom = 482.0
 size_flags_vertical = 3
 
 [node name="EditPaletteColorPicker" type="ColorPicker" parent="EditPalettePopup/VBoxContainer/HBoxContainer"]
-margin_right = 290.0
-margin_bottom = 476.0
+margin_left = 4.0
+margin_top = 4.0
+margin_right = 4.0
+margin_bottom = 4.0
 
 [node name="Panel" type="Panel" parent="EditPalettePopup/VBoxContainer/HBoxContainer"]
 margin_left = 294.0
 margin_right = 540.0
-margin_bottom = 476.0
+margin_bottom = 482.0
 size_flags_horizontal = 3
 
 [node name="EditPaletteGridContainer" type="GridContainer" parent="EditPalettePopup/VBoxContainer/HBoxContainer/Panel"]
@@ -1760,7 +1761,7 @@ columns = 8
 [node name="VBoxContainer" type="VBoxContainer" parent="EditPalettePopup/VBoxContainer/HBoxContainer"]
 margin_left = 544.0
 margin_right = 580.0
-margin_bottom = 476.0
+margin_bottom = 482.0
 
 [node name="AddSwatchButton" type="TextureButton" parent="EditPalettePopup/VBoxContainer/HBoxContainer/VBoxContainer"]
 margin_right = 36.0
@@ -1774,55 +1775,55 @@ margin_bottom = 72.0
 texture_normal = ExtResource( 30 )
 
 [node name="HBoxContainer3" type="HBoxContainer" parent="EditPalettePopup/VBoxContainer"]
-margin_top = 480.0
+margin_top = 486.0
 margin_right = 580.0
-margin_bottom = 505.0
+margin_bottom = 503.0
 
 [node name="Label" type="Label" parent="EditPalettePopup/VBoxContainer/HBoxContainer3"]
-margin_top = 5.0
+margin_top = 1.0
 margin_right = 68.0
-margin_bottom = 20.0
+margin_bottom = 16.0
 text = "Color Name:"
 
 [node name="EditPaletteColorNameLineEdit" type="LineEdit" parent="EditPalettePopup/VBoxContainer/HBoxContainer3"]
 margin_left = 72.0
 margin_right = 580.0
-margin_bottom = 25.0
+margin_bottom = 17.0
 size_flags_horizontal = 3
 
 [node name="HBoxContainer2" type="HBoxContainer" parent="EditPalettePopup/VBoxContainer"]
-margin_top = 509.0
+margin_top = 507.0
 margin_right = 580.0
 margin_bottom = 530.0
 size_flags_horizontal = 3
 
 [node name="SpacerControl" type="Control" parent="EditPalettePopup/VBoxContainer/HBoxContainer2"]
 margin_right = 159.0
-margin_bottom = 21.0
+margin_bottom = 23.0
 size_flags_horizontal = 3
 
 [node name="EditPaletteSaveButton" type="Button" parent="EditPalettePopup/VBoxContainer/HBoxContainer2"]
 margin_left = 163.0
 margin_right = 201.0
-margin_bottom = 21.0
+margin_bottom = 23.0
 text = "Save"
 
 [node name="SpacerControl2" type="Control" parent="EditPalettePopup/VBoxContainer/HBoxContainer2"]
 margin_left = 205.0
 margin_right = 364.0
-margin_bottom = 21.0
+margin_bottom = 23.0
 size_flags_horizontal = 3
 
 [node name="EditPaletteCancelButton" type="Button" parent="EditPalettePopup/VBoxContainer/HBoxContainer2"]
 margin_left = 368.0
 margin_right = 417.0
-margin_bottom = 21.0
+margin_bottom = 23.0
 text = "Cancel"
 
 [node name="SpacerControl3" type="Control" parent="EditPalettePopup/VBoxContainer/HBoxContainer2"]
 margin_left = 421.0
 margin_right = 580.0
-margin_bottom = 21.0
+margin_bottom = 23.0
 size_flags_horizontal = 3
 
 [node name="NewPaletteDialog" type="ConfirmationDialog" parent="."]
@@ -1834,7 +1835,7 @@ window_title = "Create a new custom palette from existing default?"
 margin_left = 8.0
 margin_top = 8.0
 margin_right = 315.0
-margin_bottom = 33.0
+margin_bottom = 31.0
 
 [node name="Label" type="Label" parent="NewPaletteDialog/HBoxContainer2"]
 margin_top = 5.0
diff --git a/Scripts/EditPalettePopup.gd b/Scripts/EditPalettePopup.gd
index d48cad0..ba6d7d3 100644
--- a/Scripts/EditPalettePopup.gd
+++ b/Scripts/EditPalettePopup.gd
@@ -1,9 +1,5 @@
 extends WindowDialog
 
-# Declare member variables here. Examples:
-# var a = 2
-# var b = "text"
-
 onready var palette_grid = $VBoxContainer/HBoxContainer/Panel/EditPaletteGridContainer
 onready var color_name_edit = $VBoxContainer/HBoxContainer3/EditPaletteColorNameLineEdit
 onready var color_picker = $VBoxContainer/HBoxContainer/EditPaletteColorPicker
@@ -14,28 +10,25 @@ var current_palette : String
 var current_swatch := -1
 var working_palette : Dictionary
 
-# Called when the node enters the scene tree for the first time.
-func _ready():
-	pass # Replace with function body.
 
 func open(palette : String) -> void:
 	current_palette = palette
 	if Global.palettes.has(palette):
 		working_palette = Global.palettes[palette].duplicate()
-		
+
 		_display_palette()
-		
+
 		self.popup_centered()
 	pass
 
 func _display_palette() -> void:
 	_clear_swatches()
 	var index := 0
-	
+
 	for color_data in working_palette.colors:
 		var color = Color(color_data.data)
 		var new_button = palette_button.instance()
-		
+
 		new_button.color = color
 		new_button.get_child(0).modulate = color
 		new_button.hint_tooltip = color_data.data.to_upper() + " " + color_data.name
@@ -43,7 +36,7 @@ func _display_palette() -> void:
 		new_button.index = index
 		new_button.connect("on_drop_data", self, "on_move_swatch")
 		new_button.connect("pressed", self, "on_swatch_select", [index])
-		
+
 		palette_grid.add_child(new_button)
 		index += 1
 
@@ -63,9 +56,9 @@ func on_move_swatch(from : int, to : int) -> void:
 	var color_to_move = working_palette.colors[from]
 	working_palette.colors.remove(from)
 	working_palette.colors.insert(to, color_to_move)
-	
+
 	palette_grid.move_child(palette_grid.get_child(from), to)
-	
+
 	# Re-index swatches with new order
 	var index := 0
 	for child in palette_grid.get_children():
@@ -73,10 +66,6 @@ func on_move_swatch(from : int, to : int) -> void:
 		index += 1
 	pass
 
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-#func _process(delta):
-#	pass
-
 func _on_AddSwatchButton_pressed() -> void:
 	var color = Color.white
 	var color_data = {}
@@ -84,7 +73,7 @@ func _on_AddSwatchButton_pressed() -> void:
 	color_data.name = "no name"
 	working_palette.colors.push_back(color_data)
 	var new_button = palette_button.instance()
-	
+
 	new_button.color = color
 	new_button.get_child(0).modulate = color
 	new_button.hint_tooltip = color_data.data.to_upper() + " " + color_data.name
@@ -93,7 +82,7 @@ func _on_AddSwatchButton_pressed() -> void:
 	new_button.index = index
 	new_button.connect("on_drop_data", self, "on_move_swatch")
 	new_button.connect("pressed", self, "on_swatch_select", [index])
-	
+
 	palette_grid.add_child(new_button)
 	pass # Replace with function body.
 
diff --git a/Scripts/Main.gd b/Scripts/Main.gd
index 30b04a7..72f6438 100644
--- a/Scripts/Main.gd
+++ b/Scripts/Main.gd
@@ -30,7 +30,7 @@ func _ready() -> void:
 		loaded_locales = TranslationServer.get_loaded_locales()
 	else:
 		# Hardcoded list of locales
-		loaded_locales = ["de", "el", "en", "fr"]
+		loaded_locales = ["de", "el", "en", "fr", "pl"]
 
 	# Make sure locales are always sorted, in the same order
 	loaded_locales.sort()
@@ -1051,7 +1051,7 @@ func _on_PaletteOptionButton_item_selected(ID) -> void:
 func _on_EditPalette_pressed() -> void:
 	Global.palette_container.on_edit_palette()
 	pass
-	
+
 func _on_RemovePalette_pressed() -> void:
 	Global.palette_container.remove_current_palette()
 	pass
diff --git a/Scripts/PaletteButton.gd b/Scripts/PaletteButton.gd
index 492bda6..72e9b85 100644
--- a/Scripts/PaletteButton.gd
+++ b/Scripts/PaletteButton.gd
@@ -1,9 +1,4 @@
 extends Button
-
-# Declare member variables here. Examples:
-# var a = 2
-# var b = "text"
-
 signal on_drop_data
 
 export var index := 0;
@@ -12,10 +7,6 @@ export var draggable := false
 
 var drag_preview_texture = preload("res://Assets/Graphics/Palette/swatch_drag_preview.png")
 
-# Called when the node enters the scene tree for the first time.
-func _ready():
-	pass # Replace with function body.
-	
 func get_drag_data(position):
 	var data = null;
 	if(draggable):
@@ -33,7 +24,3 @@ func can_drop_data(position, data):
 func drop_data(position, data):
 	emit_signal("on_drop_data", data.source_index, index);
 	pass;
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-#func _process(delta):
-#	pass
diff --git a/Scripts/PaletteContainer.gd b/Scripts/PaletteContainer.gd
index 096c350..ef75a25 100644
--- a/Scripts/PaletteContainer.gd
+++ b/Scripts/PaletteContainer.gd
@@ -23,12 +23,12 @@ func on_palette_select(palette_name : String) -> void:
 	if Global.palettes.has(palette_name): #Palette exists in memory
 		current_palette = palette_name
 		var palette : Dictionary = Global.palettes[palette_name]
-		
+
 		Global.remove_palette_button.disabled = true # Cannot remove by default
 		if palette.has("editable"):
 			if palette.editable:
 				Global.remove_palette_button.disabled = false # Can remove if custom palette
-		
+
 		_display_palette(palette)
 	else: #Use default on fail
 		current_palette = "Default"
@@ -36,7 +36,7 @@ func on_palette_select(palette_name : String) -> void:
 
 func on_edit_palette() -> void:
 	var palette : Dictionary = Global.palettes[current_palette]
-	
+
 	var create_new_palette := true # Create new palette by default
 	if palette.has("editable"):
 		if palette.editable:
@@ -59,15 +59,15 @@ func on_new_palette_confirmed() -> void:
 
 func create_new_palette(name : String, from_palette : Dictionary = {}) -> String: # Returns empty string, else error string
 	var new_palette : Dictionary = {}
-	
+
 	# Check if new name is valid
 	if name.empty():
 		return "Error: Palette must have a valid name."
 	if Global.palettes.has(name):
 		return "Error: Palette '" + name + "' already exists!"
-	
+
 	new_palette.name = name
-	
+
 	# Check if source palette has data
 	if from_palette.has("name"):
 		new_palette = from_palette.duplicate()
@@ -77,36 +77,36 @@ func create_new_palette(name : String, from_palette : Dictionary = {}) -> String
 		new_palette.colors = []
 		new_palette.comments = ""
 		new_palette.editable = true
-	
+
 	# Add palette to Global and options
 	Global.palettes[name] = new_palette
 	Global.palette_option_button.add_item(name)
 	var index := Global.palette_option_button.get_item_count() - 1
 	Global.palette_option_button.set_item_metadata(index, name)
 	Global.palette_option_button.select(index)
-	
+
 	save_palette(name, name + ".json")
-	
+
 	on_palette_select(name)
 	return ""
 
 func _display_palette(palette : Dictionary) -> void:
 	var index := 0
-	
+
 	for color_data in palette.colors:
 		var color = Color(color_data.data)
 		var new_button = palette_button.instance()
-		
+
 		new_button.get_child(0).modulate = color
 		new_button.hint_tooltip = color_data.data.to_upper() + " " + color_data.name
 		new_button.connect("pressed", self, "on_color_select", [index])
-		
+
 		add_child(new_button)
 		index += 1
 
 func on_color_select(index : int) -> void:
 	var color = Color(Global.palettes[current_palette].colors[index].data)
-	
+
 	if Input.is_action_just_released("left_mouse"):
 		Global.left_color_picker.color = color
 		Global.update_left_custom_brush()
@@ -137,10 +137,10 @@ func _load_palettes() -> void:
 			Global.palette_option_button.set_item_metadata(index, result)
 			if result == "Default":
 				Global.palette_option_button.select(index)
-	
+
 	dir.open("user://palettes/custom")
 	var custom_palette_files : Array = get_palette_files("user://palettes/custom")
-	
+
 	for file_name in custom_palette_files:
 		var result : String = load_palette("user://palettes/custom/" + file_name)
 		if result:
@@ -151,7 +151,7 @@ func _load_palettes() -> void:
 func get_palette_files(path : String) -> Array:
 	var dir := Directory.new()
 	var results = []
-	
+
 	dir.open(path)
 	dir.list_dir_begin()
 
@@ -163,7 +163,7 @@ func get_palette_files(path : String) -> Array:
 			results.append(file_name)
 
 	dir.list_dir_end()
-	
+
 	return results
 
 func load_palette(path : String) -> String:
@@ -200,7 +200,7 @@ func remove_current_palette() -> void:
 			Global.palette_option_button.remove_item(selected_index)
 			if(selected_index - 1 >= 0):
 				Global.palette_option_button.select(selected_index - 1)
-				on_palette_select(Global.palette_option_button.get_item_metadata(selected_index - 1))			
+				on_palette_select(Global.palette_option_button.get_item_metadata(selected_index - 1))
 	pass
 
 func _delete_palette_file(file_name : String) -> void: