Enabled proper theme swapping