100% ready on the theme styling

Signed-off-by: Fred Shequine <fshequin@gmail.com>