Add keylayout from JB leak and delete the unneeded mako files