HomeIsabelle/Phabricator

merged two theory files and cleaned up some locales