Reverted to using spaces as requested

Code also uses genuine ST settings now