diff --git a/templates/bashrc.j2 b/templates/bashrc.j2
index 38f1851..b5292b4 100644
--- a/templates/bashrc.j2
+++ b/templates/bashrc.j2
@@ -80,16 +80,19 @@ xterm*|rxvt*)
     ;;
 esac
 
+# ISO time style for ls
+TIME_STYLE=long-iso
+
 # enable color support of ls and also add handy aliases
 if [ -x /usr/bin/dircolors ]; then
     test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
     alias ls='ls --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
+    alias dir='dir --color=auto'
+    alias vdir='vdir --color=auto'
 
-    #alias grep='grep --color=auto'
-    #alias fgrep='fgrep --color=auto'
-    #alias egrep='egrep --color=auto'
+    alias grep='grep --color=auto'
+    alias fgrep='fgrep --color=auto'
+    alias egrep='egrep --color=auto'
 fi
 
 # colored GCC warnings and errors
@@ -97,9 +100,16 @@ export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quo
 
 # some more ls aliases
 alias ll='ls -l'
-alias la='ls -A'
+alias la='ls -alF'
 alias l='ls -CF'
 
+# some more aliases
+alias eh='vi ~/.bash_history'
+alias g='git'
+alias ip='ip -c'
+alias r='screen -r'
+alias tree='tree -N'
+
 # Alias definitions.
 # You may want to put all your additions into a separate file like
 # ~/.bash_aliases, instead of adding them here directly.