fix formatting; fix some return types to Maybe; add keymapLayoutName