Revert "Fix theme manager"

This reverts commit 528f10922e6963a03fbe3076c7d44b3a5aaf5930.
Revert "Derp"

This reverts commit 51191b7137ce459744f2db90f1d091c84d00d5e2.