Added commands mode and renamed macro mode to keywords