added color for list and background
fixed merge conflict