Added Keymap, ConflictsCheck & separated Bookmarks