Merge "Refactor custom input style settings"