Improve Green theme