idek atp

kitty/colors.conf

@@ -1,30 +1,30 @@
-foreground         #C2FDFD
-background         #1B1922
+foreground         #ECE5F0
+background         #262229
 background_opacity 
-cursor             #C0B28E
+cursor             #A795C1
 
-active_tab_foreground     #1B1922
-active_tab_background     #C2FDFD
-inactive_tab_foreground   #C2FDFD
-inactive_tab_background   #1B1922
+active_tab_foreground     #262229
+active_tab_background     #ECE5F0
+inactive_tab_foreground   #ECE5F0
+inactive_tab_background   #262229
 
-active_border_color   #C2FDFD
-inactive_border_color #1B1922
-bell_border_color     #AE6179
+active_border_color   #ECE5F0
+inactive_border_color #262229
+bell_border_color     #2D1C3F
 
-color0       #42404A
-color8       #70AAAA
-color1       #AE6179
-color9       #AE6179
-color2       #BD6720
-color10      #BD6720
-color3       #68A5D6
-color11      #68A5D6
-color4       #BAB695
-color12      #BAB695
-color5       #E7C2D4
-color13      #E7C2D4
-color6       #52F8F9
-color14      #52F8F9
-color7       #A0F3F4
-color15      #A0F3F4
+color0       #4C4850
+color8       #9A939E
+# color1       #2D1C3F
+# color9       #2D1C3F
+color2       #624591
+color10      #624591
+color3       #837197
+color11      #837197
+color4       #B2868D
+color12      #B2868D
+color5       #C27DD6
+color13      #C27DD6
+color6       #C9B6D5
+color14      #C9B6D5
+color7       #DCD2E2
+color15      #DCD2E2

kitty/kitty.conf

@@ -3,7 +3,11 @@ include colors.conf
 background_opacity				0
 
 font_family						ComicShannsMono Nerd Font
+<<<<<<< HEAD
 font_size						18
+=======
+font_size						14
+>>>>>>> bc1e256 (idek atp)
 
 cursor							#cdf
 cursor_trail 					1