Fix themes maybe