changed color scheme and font
fixed merge conflicts