Moved around scheme configs