working on new theme with uikit. code cleanup.