Green theme : improvements

I hope I'm requesting this pull correctly