Update from development repo, stylings galore