Refactoring + Enabling Theme Choosing again.