Work on #6
Work for #5, #6
Work on theme section #4
Merge pull request #2 from EOL-Labs/master

pull upstream