Merge with latest changes from Omega/elv - New Font added as well.