Fix #1492: Override user Scheme in "force def.theme" mode
Fix #1492: Override user Scheme in "force def.theme" mode

+ code formatting fixes for some lines

Cotonti/Cotonti,Roffun/Cotonti,Roffun/Cotonti,Cotonti/valencia,Cotonti/Cotonti,Cotonti/Cotonti,Cotonti/valencia,Roffun/Cotonti,Cotonti/valencia