Added hex color support
Worked on support for variables and commands
Cleanup