More theme cleanup, and got rid of the SkinnyPanels kind because it was not working correctly