revised template scheme
further improved colors in css
resolving merge conflict