updated theme and aliases
merge in master