Another big clean up/add
Last big update for German settings

Change-Id: Ia30b9dff524a3628aa0d8e028d37379620e2450a