Improve theme for EVE