Imported aliases and minor theme fix