Theme fixed a little, and cacheing is off for debuggin