Updated CSS to be controlled by theme roller

-Made some context limiting changes