improve midnight_rain theme, again