Internal re-write to reduce Namespace pollution
Minor Bug Fixes in Options dialog
Updated Translations