Option form added with theme selector. Not working for now though
remove tab improvements
throw error if no active tab
minor fixes