diff --git a/dotfiles/shell/dot-bash_prompt b/dotfiles/shell/dot-bash_prompt
index bc58ba4..d4d1688 100644
--- a/dotfiles/shell/dot-bash_prompt
+++ b/dotfiles/shell/dot-bash_prompt
@@ -3,11 +3,11 @@
 # Heavily inspired by @necolas’s prompt: https://github.com/necolas/dotfiles
 # iTerm → Profiles → Text → use 13pt Monaco with 1.1 vertical spacing.
 
-if [[ $COLORTERM = gnome-* && $TERM = xterm ]] && infocmp gnome-256color >/dev/null 2>&1; then
-	export TERM='gnome-256color';
-elif infocmp xterm-256color >/dev/null 2>&1; then
-	export TERM='xterm-256color';
-fi;
+#if [[ $COLORTERM = gnome-* && $TERM = xterm ]] && infocmp gnome-256color >/dev/null 2>&1; then
+#	export TERM='gnome-256color';
+#elif infocmp xterm-256color >/dev/null 2>&1; then
+#	export TERM='xterm-256color';
+#fi;
 
 prompt_git() {
 	local s='';
diff --git a/dotfiles/shell/dot-bashrc b/dotfiles/shell/dot-bashrc
index b8ab0b7..4801f2e 100644
--- a/dotfiles/shell/dot-bashrc
+++ b/dotfiles/shell/dot-bashrc
@@ -20,11 +20,6 @@ shopt -s checkwinsize
 # make less more friendly for non-text input files, see lesspipe(1)
 [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
 
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
-	xterm-color) color_prompt=yes;;
-esac
-
 # enable programmable completion features (you don't need to enable
 # this, if it's already enabled in /etc/bash.bashrc and /etc/profile
 # sources /etc/bash.bashrc).
diff --git a/dotfiles/shell/dot-exports b/dotfiles/shell/dot-exports
index 17f6209..4ecd3af 100644
--- a/dotfiles/shell/dot-exports
+++ b/dotfiles/shell/dot-exports
@@ -32,10 +32,22 @@ then
   unset LC_ALL
 fi
 
-# Highlight section titles in manual pages
-export LESS_TERMCAP_md="${yellow}";
-
-# Don’t clear the screen after quitting a manual page
-export MANPAGER="less -X";
 
 export DBUS_SESSION_BUS_ADDRESS=unix:path=/var/run/user/$(id -u)/bus;
+
+## Farbige man-pages
+export LESS_TERMCAP_mb=$(tput bold; tput setaf 2) # green
+export LESS_TERMCAP_md=$(tput bold; tput setaf 6) # cyan
+export LESS_TERMCAP_me=$(tput sgr0)
+export LESS_TERMCAP_so=$(tput bold; tput setaf 3; tput setab 0) # yellow on gray
+export LESS_TERMCAP_se=$(tput rmso; tput sgr0)
+export LESS_TERMCAP_us=$(tput smul; tput bold; tput setaf 7) # white
+export LESS_TERMCAP_ue=$(tput rmul; tput sgr0)
+export LESS_TERMCAP_mr=$(tput rev)
+export LESS_TERMCAP_mh=$(tput dim)
+export LESS_TERMCAP_ZN=$(tput ssubm)
+export LESS_TERMCAP_ZV=$(tput rsubm)
+export LESS_TERMCAP_ZO=$(tput ssupm)
+export LESS_TERMCAP_ZW=$(tput rsupm)
+export GROFF_NO_SGR=1         # For Konsole and Gnome-terminal
+
diff --git a/dotfiles/shell/dot-functions b/dotfiles/shell/dot-functions
index 7da3a32..de5ae94 100644
--- a/dotfiles/shell/dot-functions
+++ b/dotfiles/shell/dot-functions
@@ -85,17 +85,17 @@ getcertnames() {
 }
 
 # Get colors in manual pages
-man() {
-	env \
-		LESS_TERMCAP_mb=$(printf "\e[1;31m") \
-		LESS_TERMCAP_md=$(printf "\e[1;31m") \
-		LESS_TERMCAP_me=$(printf "\e[0m") \
-		LESS_TERMCAP_se=$(printf "\e[0m") \
-		LESS_TERMCAP_so=$(printf "\e[1;44;33m") \
-		LESS_TERMCAP_ue=$(printf "\e[0m") \
-		LESS_TERMCAP_us=$(printf "\e[1;32m") \
-		man "$@"
-}
+#man() {
+#	env \
+#		LESS_TERMCAP_mb=$(printf "\e[1;31m") \
+#		LESS_TERMCAP_md=$(printf "\e[1;31m") \
+#		LESS_TERMCAP_me=$(printf "\e[0m") \
+#		LESS_TERMCAP_se=$(printf "\e[0m") \
+#		LESS_TERMCAP_so=$(printf "\e[1;44;33m") \
+#		LESS_TERMCAP_ue=$(printf "\e[0m") \
+#		LESS_TERMCAP_us=$(printf "\e[1;32m") \
+#		man "$@"
+#}
 
 # get the name of a x window
 xname(){