Ensured that default theme settings is not overridden