Added _s theme
Moved files
Merge branch 'master' into esegev