Added classes for handling settings, allows changing theme and script directory
Merge fix