Further fixes to '#' types
Added some highlighting for the Akka FSM