Manage themes refact

Moving things around, fixing things... breaking more! :innocent: