Move themes out of namespace

The themes are already namespaced by filename