Moved variables higher up in the hierarchy

Added more types to variable highlighting