Green theme : improvements

I hope I'm requesting this pull correctly
Merge pull-request for the green theme