Cleanup + Use color from db when specified