Merge pull request #12 from leonardean/move-theme

ssue2&3 completed with conflict cleaned.
new merge
Merge pull request #14 from tsq/master

new merge