Theme updates
Cleanup
Cleaning up styling