Change theme loading
Clean up