app: some cleanup in the new paint options code