Add keyword replacements in kits
Add SimpleTextInput constructor for lists
Variable refactoring for clarity.