Theme name added to settings
Updated file names