Updates on Thomson ST2030S Model

Reduce to 5 tabs in tamplate editor.
Removed and cleaned up som options.