Add debug statements
Fix theme stuff