Merge conflicts navigation, simpler Kolors code and misc stuff