fix merge issues
fix theme name
replace obsolete URL
remove useless outline
add etherswitch configure line