First working versiong of new init system
Fix theme loading