Theme changes now work as intended