Cleanup theme layout and build tasks