Revert "Temp comment out Theme stuff"

This reverts commit 9db72a0ad5cf5dbce0c08ee2d3114e5eb821571e.