diff --git a/Xresources b/Xresources
index ae9cde9..6d59971 100644
--- a/Xresources
+++ b/Xresources
@@ -1,8 +1,14 @@
 ! -----------------------------------------------------------------------------
+<<<<<<< HEAD
 ! Colors: gruvbox-dark, forest night, zenburn  
 ! Source: https://github.com/morhetz/gruvbox-generalized
 !         https://github.com/jef/forest-night-xresources
 !         https://github.com/jnurmine/Zenburn
+=======
+! Based on: gruvbox-dark.xresources
+! Description: Retro groove colorscheme generalized
+! Source: https://github.com/morhetz/gruvbox-generalized
+>>>>>>> 3b76aa3 (Fix rebase conflicts)
 ! -----------------------------------------------------------------------------
 
 ! Laptop screen DPI
@@ -15,6 +21,7 @@ Xft.hinting: 1
 Xft.antialias: 1
 Xft.rgba: rgb
 
+<<<<<<< HEAD
 !---------!
 ! Gruvbox !
 ! --------!
@@ -112,6 +119,37 @@ Xft.rgba: rgb
 ! ! LightGrey + White
 ! *color7:  #dcdccc
 ! *color15: #ffffff
+=======
+! hard contrast: *background: #1d2021
+! medium contrast: *background: #282828
+! soft contrast: *background: #32302f
+*background: #1d2021
+*foreground: #ebdbb2
+! Black + DarkGrey
+*color0:  #282828
+*color8:  #928374
+! DarkRed + Red
+*color1:  #cc241d
+*color9:  #fb4934
+! DarkGreen + Green
+*color2:  #98971a
+*color10: #b8bb26
+! DarkYellow + Yellow
+*color3:  #d79921
+*color11: #fabd2f
+! DarkBlue + Blue
+*color4:  #458588
+*color12: #83a598
+! DarkMagenta + Magenta
+*color5:  #b16286
+*color13: #d3869b
+! DarkCyan + Cyan
+*color6:  #689d6a
+*color14: #8ec07c
+! LightGrey + White
+*color7:  #a89984
+*color15: #ebdbb2
+>>>>>>> 3b76aa3 (Fix rebase conflicts)
 
 !!! urxvt
 URxvt.perl-ext-common: default,matcher
diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc
index 93fbfb3..c6bbbaa 100755
--- a/config/bspwm/bspwmrc
+++ b/config/bspwm/bspwmrc
@@ -15,27 +15,49 @@ bspc rule -a vlc state=floating
 bspc rule -a Blueman-manager state=floating
 bspc rule -a Bitwarden state=floating
 bspc rule -a Leafpad state=floating
+<<<<<<< HEAD
 bspc rule -a KeePassXC state=floating
 
 bspc rule -a firefox desktop='^1' follow=on
+=======
+
+bspc rule -a firefox desktop='^1' follow=on
+bspc rule -a Brave-browser desktop='^2' follow=on
+>>>>>>> 3b76aa3 (Fix rebase conflicts)
 bspc rule -a Chromium desktop='^2' follow=on
 bspc rule -a Evince desktop='4' follow=on
 bspc rule -a Soffice desktop='^4' follow=on
 bspc rule -a Xsane desktop='^4' follow=on state=floating
 bspc rule -a kitty desktop='^6' follow=on
+<<<<<<< HEAD
 bspc rule -a URxvt desktop='^6' follow=on
 bspc rule -a URxvt:Ranger desktop='^3' follow=on
+=======
+bspc rule -a Konsole desktop='^6' follow=on
+bspc rule -a URxvt desktop='^6' follow=on
+bspc rule -a Eclipse desktop='^6' follow=on
+bspc rule -a Ranger desktop='^3' follow=on
+>>>>>>> 3b76aa3 (Fix rebase conflicts)
 bspc rule -a Thunar desktop='3' follow=on
 bspc rule -a Steam desktop='^5' follow=on state=floating
 bspc rule -a Lutris desktop='^5' follow=on state=floating
 bspc rule -a origin.exe desktop='^5' state=floating
 bspc rule -a Emacs desktop='^7' follow=on state=tiled
+<<<<<<< HEAD
 bspc rule -a discord desktop='^8'
 bspc rule -a Element desktop='^8'
 bspc rule -a Slack desktop='^9'
 bspc rule -a teams-for-linux desktop='^9'
 bspc rule -a Evolution desktop='^10'
 bspc rule -a Thunderbird desktop='^10'
+=======
+bspc rule -a jetbrains-pycharm-ce desktop='^7' follow=on
+bspc rule -a Clementine desktop='^8' follow=on 
+bspc rule -a Spotify desktop='^8' follow=on
+bspc rule -a Element desktop='^9'
+bspc rule -a Mattermost desktop='9'
+bspc rule -a Slack desktop='^9'
+>>>>>>> 3b76aa3 (Fix rebase conflicts)
 bspc rule -a tutanota-desktop desktop='^10'
 
 ### Focus on 1st workspace by default
@@ -43,6 +65,7 @@ bspc desktop -f 1
 
 ### Autostart
 grep -x sxhkd > /dev/null || sxhkd &
+<<<<<<< HEAD
 /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
 xss-lock -n /usr/lib/xsecurelock/dimmer -l -- xsecurelock &
 xidlehook --not-when-audio --not-when-fullscreen --timer 120 "xrandr --output eDP-1 --brightness .1" "xrandr --output eDP-1 --brightness 1" --timer 480 "xset s activate" "xrandr --output eDP-1 --brightness 1" &
@@ -51,3 +74,12 @@ $HOME/.local/bin/single-polybar-launcher &
 /usr/bin/dunst &
 dex -ae bspwm &
 /usr/bin/birdtray &
+=======
+/usr/bin/dunst &
+/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
+xss-lock -n /usr/lib/xsecurelock/dimmer -l -- xsecurelock &
+xidlehook --not-when-audio --not-when-fullscreen --timer 120 "xrandr --output eDP-1 --brightness .1" "xrandr --output eDP-1 --brightness 1" --timer 480 "xset s activate" "xrandr --output eDP-1 --brightness 1" &
+$HOME/.local/bin/single-polybar-launcher &
+sh ~/.fehbg &
+dex -ae bspwm &
+>>>>>>> 3b76aa3 (Fix rebase conflicts)
diff --git a/config/polybar/config.ini b/config/polybar/config.ini
index c31d47e..0690272 100644
--- a/config/polybar/config.ini
+++ b/config/polybar/config.ini
@@ -36,9 +36,15 @@ dim-value = 1.0
 locale = en_US.UTF-8
 
 font-0 = Hack:size=10;3
+<<<<<<< HEAD
 font-1 = Font Awesome 6 Free:style=Solid:size=12;3
 font-2 = Font Awesome 6 Free:style=Regular:size=12;3
 font-3 = Font Awesome 6 Brands:style=Regular:size=12;3
+=======
+font-1 = Font Awesome 5 Free:style=Solid:size=12;3
+font-2 = Font Awesome 5 Free:style=Regular:size=12;3
+font-3 = Font Awesome 5 Brands:style=Regular:size=12;3
+>>>>>>> 3b76aa3 (Fix rebase conflicts)
 
 modules-left = workspaces sep title
 modules-center = spotify
diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc
index c9e5fd7..0b1bec7 100644
--- a/config/sxhkd/sxhkdrc
+++ b/config/sxhkd/sxhkdrc
@@ -8,7 +8,11 @@ super + Return
 
 # program launcher
 super + @space
+<<<<<<< HEAD
     rofi -dpi 240 -modi drun, run -show drun -show-icons 
+=======
+    rofi -dpi 240 -modi drun, run -show drun  
+>>>>>>> 3b76aa3 (Fix rebase conflicts)
 
 # power menu
 super + @End
@@ -156,10 +160,17 @@ XF86AudioMicMute
     pactl set-source-mute @DEFAULT_SOURCE@ toggle
 
 XF86MonBrightnessDown
+<<<<<<< HEAD
     xbacklight -dec 2
 
 XF86MonBrightnessUp
     xbacklight -inc 2
+=======
+    xbacklight -dec 5
+
+XF86MonBrightnessUp
+    xbacklight -inc 5
+>>>>>>> 3b76aa3 (Fix rebase conflicts)
 
 XF86Display
     mirror-outputs
diff --git a/install.sh b/install.sh
index 47ca93e..fc3c4e8 100755
--- a/install.sh
+++ b/install.sh
@@ -25,6 +25,10 @@ cp -a $config_dir/dunst $backup/
 cp -a $config_dir/kitty $backup/
 cp -a $config_dir/nvim $backup/
 cp -a $config_dir/polybar $backup/
+<<<<<<< HEAD
+=======
+cp -a $config_dir/ranger $backup/
+>>>>>>> 3b76aa3 (Fix rebase conflicts)
 cp -a $bin_dir $backup/
 
 # Delete current files and folders
@@ -39,6 +43,10 @@ rm -rf $config_dir/dunst
 rm -rf $config_dir/kitty
 rm -rf $config_dir/nvim
 rm -rf $config_dir/polybar
+<<<<<<< HEAD
+=======
+rm -rf $config_dir/ranger/
+>>>>>>> 3b76aa3 (Fix rebase conflicts)
 rm -rf $bin_dir
 
 # Create HOME symlinks
@@ -51,20 +59,37 @@ ln -sf $dotfiles_dir/vimrc ~/.vimrc
 ln -sf $dotfiles_dir/Xresources ~/.Xresources
 
 # Create $config_dir, sub-directories, and symlinks
+<<<<<<< HEAD
 mkdir -p $config_dir/{bspwm,dunst,kitty,nvim,polybar,rofi,sxhkd}
 ln -sf $dotfiles_dir/config/bspwm/bspwmrc $config_dir/bspwm/bspwmrc
 ln -sf $dotfiles_dir/config/dunst/dunstrc $config_dir/dunst/dunstrc
 ln -sf $dotfiles_dir/config/kitty/kitty.conf $config_dir/kitty/kitty.conf
 #ln -sf $dotfiles_dir/config/kitty/gruvbox.conf $config_dir/kitty/gruvbox.conf
 ln -sf $dotfiles_dir/config/kitty/zenburn.conf $config_dir/kitty/zenburn.conf
+=======
+mkdir -p $config_dir/{bspwm,dunst,kitty,nvim,polybar,ranger,rofi,sxhkd}
+ln -sf $dotfiles_dir/config/bspwm/bspwmrc $config_dir/bspwm/bspwmrc
+ln -sf $dotfiles_dir/config/dunst/dunstrc $config_dir/dunst/dunstrc
+ln -sf $dotfiles_dir/config/kitty/kitty.conf $config_dir/kitty/kitty.conf
+ln -sf $dotfiles_dir/config/kitty/gruvbox.conf $config_dir/kitty/gruvbox.conf
+>>>>>>> 3b76aa3 (Fix rebase conflicts)
 ln -sf $dotfiles_dir/config/nvim/init.vim $config_dir/nvim/init.vim
 ln -sf $dotfiles_dir/config/polybar/config.ini $config_dir/polybar/config.ini
 ln -sf $dotfiles_dir/config/polybar/colors.ini $config_dir/polybar/colors.ini
 ln -sf $dotfiles_dir/config/polybar/modules.ini $config_dir/polybar/modules.ini
 ln -sf $dotfiles_dir/config/polybar/custom_modules.ini $config_dir/polybar/custom_modules.ini
+<<<<<<< HEAD
 ln -sf $dotfiles_dir/config/rofi/config.everforest.rasi $config_dir/rofi/config.rasi
 #ln -sf $dotfiles_dir/config/rofi/config.gruvbox.rasi $config_dir/rofi/config.rasi
 #ln -sf $dotfiles_dir/config/rofi/config.zenburn.rasi $config_dir/rofi/config.rasi
+=======
+ln -sf $dotfiles_dir/config/ranger/commands_full.py $config_dir/ranger/commands_full.py
+ln -sf $dotfiles_dir/config/ranger/commands.py $config_dir/ranger/commands.py
+ln -sf $dotfiles_dir/config/ranger/rc.conf $config_dir/ranger/rc.conf
+ln -sf $dotfiles_dir/config/ranger/rifle.conf $config_dir/ranger/rifle.conf
+ln -sf $dotfiles_dir/config/ranger/scope.sh $config_dir/ranger/scope.sh
+ln -sf $dotfiles_dir/config/rofi/config.rasi $config_dir/rofi/config.rasi
+>>>>>>> 3b76aa3 (Fix rebase conflicts)
 ln -sf $dotfiles_dir/config/sxhkd/sxhkdrc $config_dir/sxhkd/sxhkdrc
 
 # Create $bin_dir and symlinks
@@ -76,5 +101,8 @@ ln -sf $dotfiles_dir/bin/toggle-wifi $bin_dir
 # Finishing up
 source ~/.bashrc
 source ~/.bash_profile
+<<<<<<< HEAD
 source ~/.profile
+=======
+>>>>>>> 3b76aa3 (Fix rebase conflicts)
 xrdb ~/.Xresources