Exclude compare button from green coloring
Fix some timeline item colors and diff text color
Some fixes to Pull request code discussion
(merge conflict fix)