Fix ordering of general settings and el get and color theme