Small refractor and changes to match ThemeForest requirements.