Improve variable naming and drop fallback colors