andreas theme
remove unused aliases and some coflicting ones
my custom changes