#77 Theme service now uses theme from folder