Improve color theme variable naming