Settings Theme fixes and polishing