Optimizing theme

Testing, debugging, etc.