@ovnicraft I think we are ok here since if THEME_NAME is set to "" it will be set to None.