diff --git a/polybar/config.ini b/polybar/config.ini
index dec39d6..d4ce913 100644
--- a/polybar/config.ini
+++ b/polybar/config.ini
@@ -55,7 +55,11 @@ padding-left = 2
 padding-right = 2
 
 module-margin-left = 1
+<<<<<<< HEAD
 module-margin-right =3
+=======
+module-margin-right =2
+>>>>>>> 45fd1a21da0ed93fa3ec4e7cec22c48e1ab754cb
 
 ;separator = |
 ;separator-foreground = ${colors.disabled}
@@ -63,7 +67,11 @@ module-margin-right =3
 font-0 = Roboto:pixelsize=11:style=Medium; 2
 font-1 = unicode:fontformat=truetype:size=8:antialias=false;0
 font-2 = siji:pixelsize=10;1
+<<<<<<< HEAD
 font-3 = SymbolsNerdFont:size=15;3
+=======
+font-3 = SymbolsNerdFont:size=14;5
+>>>>>>> 45fd1a21da0ed93fa3ec4e7cec22c48e1ab754cb
 modules-left = my-text-label xworkspaces xwindow
 modules-right = filesystem  memory cpu battery temperature wlan date
 ; modules-right = filesystem pulseaudio xkeyboard memory cpu wlan eth date
@@ -226,7 +234,11 @@ ramp-foreground = ${colors.primary}
 type = internal/battery
 battery = BAT0
 adapter = ADP1
+<<<<<<< HEAD
 full-at = 100
+=======
+full-at = 98
+>>>>>>> 45fd1a21da0ed93fa3ec4e7cec22c48e1ab754cb
 interval = 1
 format-charging = <animation-charging> <label-charging>
 format-charging-underline = #637d75
@@ -260,7 +272,11 @@ type = custom/text
 content = 
 ;content-background = #2f7e25
 content-foreground = #2f6a7f
+<<<<<<< HEAD
 content-padding = 1
+=======
+content-padding = 3
+>>>>>>> 45fd1a21da0ed93fa3ec4e7cec22c48e1ab754cb
 [settings]
 screenchange-reload = true
 pseudo-transparency = true
diff --git a/vscode/settings.json b/vscode/settings.json
index f0b0f82..5a69577 100644
--- a/vscode/settings.json
+++ b/vscode/settings.json
@@ -77,6 +77,6 @@
   "[shellscript]": {
     "editor.defaultFormatter": "foxundermoon.shell-format"
   },
-  "workbench.colorTheme": "Alien Blood - No bold or italics",
+  "workbench.colorTheme": "Default Light+",
   "window.titleBarStyle": "custom"
 }