Latest Umlaut Code

Merge in the latest Umlaut code and adjust styles to accomodate.