Fixing theme details.
Making sure TitanFramework class exists
Various cleanup changes