Generel settings moved to Settings.java
Merged