font-lock fixes
fix DTD syntax
fix if-then-else expressions type resolution