Better themeing support + more themes
Slight cleanup