merging work so far

still to do on the Pi addon:
select Mode
add SDTV options
replace strings
finalise layout
create Other setting editor window