Revamp of theme

Revamped theme to fix countless bugs, namely Query errors