Clean up code
Deactivate theme in skeleton
Update version