Comment GA inclusion
Rename/Organise them-options settings