redo format, add folder for themes