Add rake

Removed useless themes

Refactor