Submodules and configuration

Some config issues with the whitelabel, please merge!