Fix up some frameworks!

Let the theming begin! xD

Change-Id: Iecfe350d96b67011702ec6d56b085930279a11dd