Fixing a theming nightmare...v2.0 (text) coming soon