Fixing default theme activation and making things more readable