diff --git a/common/.bashrc b/common/.bashrc
index adaa914..367dee6 100644
--- a/common/.bashrc
+++ b/common/.bashrc
@@ -161,6 +161,50 @@ export THEME_HISTFILE=~/.theme_history
[ -e "$THEME_HISTFILE" ] && theme.sh "$(theme.sh -l|tail -n1)"
alias th='theme.sh -i2'
+su() {
+ (
+ INHIBIT_THEME_HIST=1 theme.sh red-alert
+ trap 'theme.sh "$(theme.sh -l|tail -n1)"' INT
+ env su "$@"
+ theme.sh "$(theme.sh -l|tail -n1)"
+ )
+}
+
+sudo() {
+ (
+ pid=$(exec sh -c 'echo "$PPID"')
+
+ # If the command takes less than .2s, don't change the theme.
+ # We could also just match on 'su' and ignore everything else,
+ # but this also accomodates other long running commands
+ # like 'sudo sleep 5s'. Modify to taste.
+
+ (
+ sleep .2s
+ ps -p "$pid" > /dev/null && INHIBIT_THEME_HIST=1 theme.sh red-alert
+ ) &
+
+ trap 'theme.sh "$(theme.sh -l|tail -n1)"' INT
+ env sudo "$@"
+ theme.sh "$(theme.sh -l|tail -n1)"
+ )
+}
+
+ssh() {
+ (
+ INHIBIT_THEME_HIST=1 theme.sh selenized-dark
+ trap 'theme.sh "$(theme.sh -l|tail -n1)"' INT
+ env ssh "$@"
+ theme.sh "$(theme.sh -l|tail -n1)"
+ )
+}
+
+# Git prompt
+if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then
+ GIT_PROMPT_ONLY_IN_REPO=1
+ source $HOME/.bash-git-prompt/gitprompt.sh
+fi
+
# Fuzzy Finder (fzf)
source /usr/share/fzf/completion.bash
source /usr/share/fzf/key-bindings.bash
diff --git a/lang/en/.config/mabox/mbhelper.csv b/lang/en/.config/mabox/mbhelper.csv
index b9ba3ea..2368d53 100644
--- a/lang/en/.config/mabox/mbhelper.csv
+++ b/lang/en/.config/mabox/mbhelper.csv
@@ -44,7 +44,7 @@
super-alt-t Tile helper,jgtile,,,#pipemenu
super-alt-h History helper,jghistory-pipe -s,,,#pipemenu
super-alt-e Espanso - text expander,jgespanso-pipe -s,,,#pipemenu
- super-alt-c Color Menu,mbxcolors
+ super-alt-c Color Menu,colormenu
super-alt-o Colorizer,colorizer -s
super-alt-m Configure Menu/Sidepanels,jgmenusettings-pipe -s,,,#pipemenu
super-alt-w Configure Wallpaper and ScreenLocker,jgwallpaperchanger -s,,,#pipemenu
diff --git a/lang/en/.config/mabox/places-append.csv b/lang/en/.config/mabox/places-append.csv
index 9b611ab..9b94d55 100644
--- a/lang/en/.config/mabox/places-append.csv
+++ b/lang/en/.config/mabox/places-append.csv
@@ -11,7 +11,7 @@
##########################
^sep(Your own commands)
-ColorMenu,mbxcolors
+ColorMenu,colormenu
FSearch,fsearch
PyRadio - Internet Radio Player,terminator -T "PyRadio" --geometry=420x440-20-20 -e "pyradio -p"
#Newsboat - RSS Reader,^term(newsboat)
diff --git a/lang/es/.config/mabox/places-append.csv b/lang/es/.config/mabox/places-append.csv
index 7294854..39303fe 100644
--- a/lang/es/.config/mabox/places-append.csv
+++ b/lang/es/.config/mabox/places-append.csv
@@ -10,7 +10,7 @@
# Comment out line to disable
##########################
^sep(Agrega tus programas aquí)
-ColorMenu,mbxcolors
+ColorMenu,colormenu
FSearch - Buscar archivos,fsearch
PyRadio - Radios de Internet,terminator -T "PyRadio" --geometry=420x440-20-20 -e "pyradio -p"
#Newsboat - Lector de RSS,^term(newsboat)
diff --git a/lang/pl/.config/mabox/mbhelper.csv b/lang/pl/.config/mabox/mbhelper.csv
index ee901f7..54d4c8e 100644
--- a/lang/pl/.config/mabox/mbhelper.csv
+++ b/lang/pl/.config/mabox/mbhelper.csv
@@ -43,7 +43,7 @@
super-alt-t Tile helper,jgtile,,,#pipemenu
super-alt-h Historia,jghistory-pipe -s,,,#pipemenu
super-alt-e Espanso - text expander,jgespanso-pipe -s,,,#pipemenu
- super-alt-c Menu Kolorów,mbxcolors
+ super-alt-c Menu Kolorów,colormenu
super-alt-o Colorizer,colorizer -s
super-alt-m Konfiguracja Menu/Paneli,jgmenusettings-pipe -s,,,#pipemenu
super-alt-w Konfiguracja Tapety i Blokady Ekranu,jgwallpaperchanger -s,,,#pipemenu
diff --git a/lang/pl/.config/mabox/places-append.csv b/lang/pl/.config/mabox/places-append.csv
index 02d6edb..f655cb8 100644
--- a/lang/pl/.config/mabox/places-append.csv
+++ b/lang/pl/.config/mabox/places-append.csv
@@ -10,7 +10,7 @@
##########################
^sep(Własne)
-Picker kolorów,mbxcolors
+Menu kolorów,colormenu
PyRadio - Internet Radio Player,terminator -T "PyRadio" --geometry=420x440-20-20 -e "pyradio -p"
Lxtask - menadżer zadań GUI,lxtask
btop - menadżer zadań CLI,^term(btop)