Huge cleanup and implemented theme selector