Feature/theme work

Commented out code