Use latest theme widgets and standardize on UI/workflow