diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 560835dab2..dd168f0114 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -13,8 +13,8 @@ jobs:
     if: github.event.label.name == 'benchmark'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: "3.9"
 
@@ -30,7 +30,7 @@ jobs:
           echo "::set-output name=body::$body"
 
       - name: Find Comment
-        uses: peter-evans/find-comment@v1
+        uses: peter-evans/find-comment@v2
         id: fc
         with:
           issue-number: ${{ github.event.pull_request.number }}
@@ -38,7 +38,7 @@ jobs:
           body-includes: '# Benchmarks'
 
       - name: Create or update comment
-        uses: peter-evans/create-or-update-comment@v1
+        uses: peter-evans/create-or-update-comment@v2
         with:
           comment-id: ${{ steps.fc.outputs.comment-id }}
           issue-number: ${{ github.event.pull_request.number }}
diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml
index 3d220d72f0..779bf09b8b 100644
--- a/.github/workflows/code-style.yml
+++ b/.github/workflows/code-style.yml
@@ -13,8 +13,8 @@ jobs:
   code-style:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: 3.9
       - run: make venv
diff --git a/.github/workflows/content.yml b/.github/workflows/content.yml
new file mode 100644
index 0000000000..d5d6dbcfa4
--- /dev/null
+++ b/.github/workflows/content.yml
@@ -0,0 +1,22 @@
+name: Update Generated Content
+on:
+  push:
+    branches:
+      - master
+jobs:
+  update-content:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.9
+      - run: make content
+      - name: Create Pull Request
+        id: cpr
+        uses: peter-evans/create-pull-request@v4
+        with:
+          commit-message: "[automated] Update generated content"
+          title: "[automated] Update generated content"
+          delete-branch: true
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 5edb47fa46..f4a21794d1 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -12,8 +12,8 @@ jobs:
   coverage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: "3.10"
       - run: make install
diff --git a/.github/workflows/docs-check-markdown.yml b/.github/workflows/docs-check-markdown.yml
index f019bf7017..a19c25916a 100644
--- a/.github/workflows/docs-check-markdown.yml
+++ b/.github/workflows/docs-check-markdown.yml
@@ -10,7 +10,7 @@ jobs:
   doc:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml
index 62df9c0c0d..797bdc56e0 100644
--- a/.github/workflows/docs-deploy.yml
+++ b/.github/workflows/docs-deploy.yml
@@ -17,6 +17,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install HTTPie
-        run: sudo snap install --edge httpie
+        run: sudo pip install httpie
       - name: Trigger new documentation build
         run: http --ignore-stdin POST ${{ secrets.DOCS_UPDATE_VERCEL_HOOK }}
diff --git a/.github/workflows/docs-update-install.yml b/.github/workflows/docs-update-install.yml
deleted file mode 100644
index 3a22aaa0bb..0000000000
--- a/.github/workflows/docs-update-install.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Update & Install Docs
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - .github/workflows/docs-update-install.yml
-      - docs/installation/*
-
-  # Allow to call the workflow manually
-  workflow_dispatch:
-
-jobs:
-  doc:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: 3.9
-      - run: make install
-      - run: make doc-update-install
-      - uses: Automattic/action-commit-to-branch@master
-        with:
-          branch: master
-          commit_message: |
-            Auto-update install docs
-
-            Via .github/workflows/docs-update-install.yml
-
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release-brew.yml b/.github/workflows/release-brew.yml
new file mode 100644
index 0000000000..d58e6b6e3d
--- /dev/null
+++ b/.github/workflows/release-brew.yml
@@ -0,0 +1,26 @@
+name: Release on Homebrew
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: "The branch, tag or SHA to release from"
+        required: true
+        default: "master"
+
+jobs:
+  brew-release:
+    name: Release the Homebrew Package
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.inputs.branch }}
+
+      - uses: mislav/bump-homebrew-formula-action@v2
+        with:
+          formula-name: httpie
+          tag-name: ${{ github.events.inputs.branch }}
+        env:
+          COMMITTER_TOKEN: ${{ secrets.BREW_UPDATE_TOKEN }}
diff --git a/.github/workflows/release-choco.yml b/.github/workflows/release-choco.yml
new file mode 100644
index 0000000000..01e0c40642
--- /dev/null
+++ b/.github/workflows/release-choco.yml
@@ -0,0 +1,61 @@
+name: Release on Chocolatey
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: "The branch, tag or SHA to release from"
+        required: true
+        default: "master"
+
+jobs:
+  brew-release:
+    name: Release the Chocolatey
+    runs-on: windows-2019
+    env:
+        package-dir: docs\packaging\windows-chocolatey
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.inputs.branch }}
+
+      # Chocolatey comes already installed on the Windows GHA image
+      - name: Build the Choco package
+        shell: cmd
+        run: choco pack -v
+        working-directory: ${{ env.package-dir }}
+
+      - name: Check the Choco package
+        run: choco info httpie -s .
+        working-directory: ${{ env.package-dir }}
+
+      - name: Local installation
+        run: |
+          choco install httpie -y -dv -s "'.;https://community.chocolatey.org/api/v2/'"
+        working-directory: ${{ env.package-dir }}
+
+      - name: Test the locally installed binaries
+        run: |
+          # Source: https://stackoverflow.com/a/46760714/15330941
+
+          # Make `refreshenv` available right away, by defining the $env:ChocolateyInstall
+          # variable and importing the Chocolatey profile module.
+          $env:ChocolateyInstall = Convert-Path "$((Get-Command choco).Path)\..\.."
+          Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
+          refreshenv
+
+          http --version
+          https --version
+          httpie --version
+          choco uninstall -y httpie
+        working-directory: ${{ env.package-dir }}
+
+      - name: Publish on Chocolatey
+        shell: bash
+        env:
+          CHOCO_API_KEY: ${{ secrets.CHOCO_API_KEY }}
+        run: |
+          choco apikey --key $CHOCO_API_KEY --source https://push.chocolatey.org/
+          choco push httpie*.nupkg --source https://push.chocolatey.org/
+        working-directory: ${{ env.package-dir }}
diff --git a/.github/workflows/release-linux-standalone.yml b/.github/workflows/release-linux-standalone.yml
new file mode 100644
index 0000000000..01821c9a91
--- /dev/null
+++ b/.github/workflows/release-linux-standalone.yml
@@ -0,0 +1,77 @@
+name: Release as Standalone Linux Package
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: "The branch, tag or SHA to release from"
+        required: true
+        default: "master"
+      tag_name:
+        description: "Which release to upload the artifacts to (e.g., 3.0)"
+        required: true
+
+  release:
+    types: [released, prereleased]
+
+
+jobs:
+  binary-build-and-release:
+    name: Build and Release
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.inputs.branch }}
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.9
+
+      - name: Build Artifacts
+        run: |
+          cd extras/packaging/linux
+          ./get_release_artifacts.sh
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: http
+          path: extras/packaging/linux/artifacts/dist/http
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: httpie.deb
+          path: extras/packaging/linux/artifacts/dist/*.deb
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: httpie.rpm
+          path: extras/packaging/linux/artifacts/dist/*.rpm
+
+      - name: Determine the release upload upload_url
+        id: release_id
+        run: |
+          pip install httpie
+          export API_URL="api.github.com/repos/httpie/cli/releases/tags/${{ github.event.inputs.tag_name }}"
+          export UPLOAD_URL=`https --ignore-stdin GET $API_URL | jq -r ".upload_url"`
+          echo "::set-output name=UPLOAD_URL::$UPLOAD_URL"
+
+      - name: Publish Debian Package
+        uses: actions/upload-release-asset@v1.0.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.release_id.outputs.UPLOAD_URL }}
+          asset_path: extras/packaging/linux/artifacts/dist/httpie_${{ github.event.inputs.tag_name }}_amd64.deb
+          asset_name: httpie-${{ github.event.inputs.tag_name }}.deb
+          asset_content_type: binary/octet-stream
+
+      - name: Publish Single Executable
+        uses: actions/upload-release-asset@v1.0.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.release_id.outputs.UPLOAD_URL }}
+          asset_path: extras/packaging/linux/artifacts/dist/http
+          asset_name: http
+          asset_content_type: binary/octet-stream
diff --git a/.github/workflows/release-pypi.yml b/.github/workflows/release-pypi.yml
new file mode 100644
index 0000000000..28ad081712
--- /dev/null
+++ b/.github/workflows/release-pypi.yml
@@ -0,0 +1,30 @@
+name: Release on PyPI
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: "The branch, tag or SHA to release from"
+        required: true
+        default: "master"
+
+jobs:
+  pypi-build-and-release:
+    name: Build and Release
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.inputs.branch }}
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.9
+
+      - name: Build a binary wheel and a source tarball
+        run: make install && make build
+
+      - name: Release on PyPI
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          password: ${{ secrets.PYPI_TOKEN }}
diff --git a/.github/workflows/release-snap.yml b/.github/workflows/release-snap.yml
index f67c0e2577..ad25186e88 100644
--- a/.github/workflows/release-snap.yml
+++ b/.github/workflows/release-snap.yml
@@ -1,4 +1,4 @@
-name: Release snap
+name: Release on Snap
 
 on:
   workflow_dispatch:
@@ -7,22 +7,35 @@ on:
         description: "The branch, tag or SHA to release from"
         required: true
         default: "master"
-      level:
-        description: "Release level: stable, candidate, beta, edge"
-        required: true
-        default: "edge"
 
 jobs:
-  snap:
+  snap-build-and-release:
+    name: Build & Release the Snap Package
     runs-on: ubuntu-latest
+
+    strategy:
+      # If any of the stages fail, then we'll stop the action
+      # to give release manager time to investigate the underlying
+      # issue.
+      fail-fast: true
+      matrix:
+        level: [edge, beta, candidate, stable]
+
+    # Set the concurrency level for this version, so
+    # that we'll release one by one.
+    concurrency: ${{ github.event.inputs.branch }}
+
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.inputs.branch }}
+
       - uses: snapcore/action-build@v1
         id: build
+
       - uses: snapcore/action-publish@v1
+        env:
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
         with:
-          store_login: ${{ secrets.SNAP_STORE_LOGIN }}
           snap: ${{ steps.build.outputs.snap }}
-          release: ${{ github.event.inputs.level }}
+          release: ${{ matrix.level }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 12753b49f5..0000000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Release on PyPI
-
-on:
-  # Add a "Trigger" button to manually start the workflow.
-  workflow_dispatch:
-    inputs:
-      branch:
-        description: "The branch, tag or SHA to release from"
-        required: true
-        default: "master"
-  # It could be fully automated by uncommenting following lines.
-  # Let's see later if we are confident enough to try it :)
-  # release:
-  #   types:
-  #     - published
-
-jobs:
-  new-release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          ref: ${{ github.event.inputs.branch }}
-      - name: PyPI configuration
-        run: |
-          echo "[distutils]\nindex-servers=\n    httpie\n\n[httpie]\nrepository = https://upload.pypi.org/legacy/\n" > $HOME/.pypirc
-      - uses: actions/setup-python@v2
-        with:
-          python-version: 3.9
-      - run: make publish
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index a3aae58de5..7aa2e24555 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v4
+    - uses: actions/stale@v8
       with:
         close-pr-message: 'Thanks for the pull request, but since it was stale for more than a 30 days we are closing it. If you want to work back on it, feel free to re-open it or create a new one.'
         stale-pr-label: 'stale'
diff --git a/.github/workflows/test-package-linux-snap.yml b/.github/workflows/test-package-linux-snap.yml
index 12a2766a40..ac9640a06d 100644
--- a/.github/workflows/test-package-linux-snap.yml
+++ b/.github/workflows/test-package-linux-snap.yml
@@ -12,7 +12,7 @@ jobs:
   snap:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Build
         uses: snapcore/action-build@v1
         id: snapcraft
diff --git a/.github/workflows/test-package-mac-brew.yml b/.github/workflows/test-package-mac-brew.yml
index 6570a2afd9..babdaa5def 100644
--- a/.github/workflows/test-package-mac-brew.yml
+++ b/.github/workflows/test-package-mac-brew.yml
@@ -11,7 +11,7 @@ jobs:
   brew:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup brew
         run: |
           brew developer on
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e3cde99669..d98b63ae69 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,4 +1,7 @@
 name: Tests
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 
 on:
   push:
@@ -21,13 +24,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.7, 3.8, 3.9, "3.10"]
+        os: [ubuntu-latest, macos-13, windows-latest]
+        python-version:
+          - '3.12'
+          - '3.11'
+          - '3.10'
+          - '3.9'
+          - '3.8'
+          - '3.7'
         pyopenssl: [0, 1]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Windows setup
diff --git a/.gitignore b/.gitignore
index 4f4d94543e..aee3301cc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,8 +43,8 @@ MANIFEST
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
 *.spec
+*.manifest
 
 # Installer logs
 pip-log.txt
@@ -151,3 +151,5 @@ dmypy.json
 
 # Windows Chocolatey
 *.nupkg
+
+artifacts/
diff --git a/.packit.yaml b/.packit.yaml
index 8fc33379d6..015fdf8e57 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -3,16 +3,10 @@
 specfile_path: httpie.spec
 actions:
   # get the current Fedora Rawhide specfile:
-  # post-upstream-clone: "wget https://src.fedoraproject.org/rpms/httpie/raw/rawhide/f/httpie.spec -O httpie.spec"
-  post-upstream-clone: "cp docs/packaging/linux-fedora/httpie.spec.txt httpie.spec"
+  post-upstream-clone: "wget https://src.fedoraproject.org/rpms/httpie/raw/rawhide/f/httpie.spec -O httpie.spec"
+  # Use this when the latest spec is not up-to-date.
+  # post-upstream-clone: "cp docs/packaging/linux-fedora/httpie.spec.txt httpie.spec"
 jobs:
-- job: copr_build
-  trigger: pull_request
-  metadata:
-    targets:
-    - fedora-all
-    additional_repos:
-    - "https://kojipkgs.fedoraproject.org/repos/f$releasever-build/latest/$basearch/"
 - job: propose_downstream
   trigger: release
   metadata:
diff --git a/AUTHORS.md b/AUTHORS.md
index 72fc384df6..5351307d84 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -4,7 +4,7 @@
 
 ## Patches, features, ideas
 
-[Complete list of contributors on GitHub](https://github.com/httpie/httpie/graphs/contributors)
+[Complete list of contributors on GitHub](https://github.com/httpie/cli/graphs/contributors)
 
 - [Cláudia T. Delgado](https://github.com/claudiatd)
 - [Hank Gay](https://github.com/gthank)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 045d406cfe..0497ac3508 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,112 +3,156 @@
 This document records all notable changes to [HTTPie](https://httpie.io).
 This project adheres to [Semantic Versioning](https://semver.org/).
 
-## [3.0.2](https://github.com/httpie/httpie/compare/3.0.1...3.0.2) (2022-01-24)
+## [3.2.4](https://github.com/httpie/cli/compare/3.2.3...3.2.4) (2024-11-01)
+
+- Fix default certs loading and unpin `requests`. ([#1596](https://github.com/httpie/cli/issues/1596))
+
+## [3.2.3](https://github.com/httpie/cli/compare/3.2.2...3.2.3) (2024-07-10)
+
+- Fix SSL connections by pinning the `requests` version to `2.31.0`. (#1583, #1581)
+- Make it possible to [unset](https://httpie.io/docs/cli/default-request-headers) the `User-Agent` and `Accept-Encoding` request headers. ([#1502](https://github.com/httpie/cli/issues/1502))
+
+## [3.2.2](https://github.com/httpie/cli/compare/3.2.1...3.2.2) (2023-05-19)
+
+- Fixed compatibility with urllib3 2.0.0. ([#1499](https://github.com/httpie/cli/issues/1499))
+
+## [3.2.1](https://github.com/httpie/cli/compare/3.1.0...3.2.1) (2022-05-06)
+
+- Improved support for determining auto-streaming when the `Content-Type` header includes encoding information. ([#1383](https://github.com/httpie/cli/pull/1383))
+- Fixed the display of the crash happening in the secondary process for update checks. ([#1388](https://github.com/httpie/cli/issues/1388))
+
+## [3.2.0](https://github.com/httpie/cli/compare/3.1.0...3.2.0) (2022-05-05)
+
+- Added a warning for notifying the user about the new updates. ([#1336](https://github.com/httpie/cli/pull/1336))
+- Added support for single binary executables. ([#1330](https://github.com/httpie/cli/pull/1330))
+- Added support for man pages (and auto generation of them from the parser declaration). ([#1317](https://github.com/httpie/cli/pull/1317))
+- Added `http --manual` for man pages & regular manual with pager. ([#1343](https://github.com/httpie/cli/pull/1343))
+- Added support for session persistence of repeated headers with the same name. ([#1335](https://github.com/httpie/cli/pull/1335))
+- Added support for sending `Secure` cookies to the `localhost` (and `.local` suffixed domains). ([#1308](https://github.com/httpie/cli/issues/1308))
+- Improved UI for the progress bars. ([#1324](https://github.com/httpie/cli/pull/1324))
+- Fixed redundant creation of `Content-Length` header on `OPTIONS` requests. ([#1310](https://github.com/httpie/cli/issues/1310))
+- Fixed blocking of warning thread on some use cases. ([#1349](https://github.com/httpie/cli/issues/1349))
+- Changed `httpie plugins` to the new `httpie cli` namespace as `httpie cli plugins` (`httpie plugins` continues to work as a hidden alias). ([#1320](https://github.com/httpie/cli/issues/1320))
+- Soft deprecated the `--history-print`. ([#1380](https://github.com/httpie/cli/pull/1380))
+
+## [3.1.0](https://github.com/httpie/cli/compare/3.0.2...3.1.0) (2022-03-08)
+
+- **SECURITY** Fixed the [vulnerability](https://github.com/httpie/cli/security/advisories/GHSA-9w4w-cpc8-h2fq) that caused exposure of cookies on redirects to third party hosts. ([#1312](https://github.com/httpie/cli/pull/1312))
+- Fixed escaping of integer indexes with multiple backslashes in the nested JSON builder. ([#1285](https://github.com/httpie/cli/issues/1285))
+- Fixed displaying of status code without a status message on non-`auto` themes. ([#1300](https://github.com/httpie/cli/issues/1300))
+- Fixed redundant issuance of stdin detection warnings on some rare cases due to underlying implementation. ([#1303](https://github.com/httpie/cli/pull/1303))
+- Fixed double `--quiet` so that it will now suppress all python level warnings. ([#1271](https://github.com/httpie/cli/issues/1271))
+- Added support for specifying certificate private key passphrases through `--cert-key-pass` and prompts. ([#946](https://github.com/httpie/cli/issues/946))
+- Added `httpie cli export-args` command for exposing the parser specification for the `http`/`https` commands. ([#1293](https://github.com/httpie/cli/pull/1293))
+- Improved regulation of top-level arrays. ([#1292](https://github.com/httpie/cli/commit/225dccb2186f14f871695b6c4e0bfbcdb2e3aa28))
+- Improved UI layout for standalone invocations. ([#1296](https://github.com/httpie/cli/pull/1296))
+
+## [3.0.2](https://github.com/httpie/cli/compare/3.0.1...3.0.2) (2022-01-24)
 
 [What’s new in HTTPie for Terminal 3.0 →](https://httpie.io/blog/httpie-3.0.0)
 
-- Fixed usage of `httpie` when there is a presence of a config with `default_options`. ([#1280](https://github.com/httpie/httpie/pull/1280))
+- Fixed usage of `httpie` when there is a presence of a config with `default_options`. ([#1280](https://github.com/httpie/cli/pull/1280))
 
-## [3.0.1](https://github.com/httpie/httpie/compare/3.0.0...3.0.1) (2022-01-23)
+## [3.0.1](https://github.com/httpie/cli/compare/3.0.0...3.0.1) (2022-01-23)
 
 [What’s new in HTTPie for Terminal 3.0 →](https://httpie.io/blog/httpie-3.0.0)
 
-- Changed the value shown as time elapsed from time-to-read-headers to total exchange time. ([#1277](https://github.com/httpie/httpie/issues/1277))
+- Changed the value shown as time elapsed from time-to-read-headers to total exchange time. ([#1277](https://github.com/httpie/cli/issues/1277))
 
-## [3.0.0](https://github.com/httpie/httpie/compare/2.6.0...3.0.0) (2022-01-21)
+## [3.0.0](https://github.com/httpie/cli/compare/2.6.0...3.0.0) (2022-01-21)
 
 [What’s new in HTTPie for Terminal 3.0 →](https://httpie.io/blog/httpie-3.0.0)
 
-- Dropped support for Python 3.6. ([#1177](https://github.com/httpie/httpie/issues/1177))
-- Improved startup time by 40%. ([#1211](https://github.com/httpie/httpie/pull/1211))
-- Added support for nested JSON syntax. ([#1169](https://github.com/httpie/httpie/issues/1169))
-- Added `httpie plugins` interface for plugin management. ([#566](https://github.com/httpie/httpie/issues/566))
-- Added support for Bearer authentication via `--auth-type=bearer` ([#1215](https://github.com/httpie/httpie/issues/1215)).
-- Added support for quick conversions of pasted URLs into HTTPie calls by adding a space after the protocol name (`$ https ://pie.dev` → `https://pie.dev`). ([#1195](https://github.com/httpie/httpie/issues/1195))
-- Added support for _sending_ multiple HTTP header lines with the same name. ([#130](https://github.com/httpie/httpie/issues/130))
-- Added support for _receiving_ multiple HTTP headers lines with the same name. ([#1207](https://github.com/httpie/httpie/issues/1207))
-- Added support for basic JSON types on `--form`/`--multipart` when using JSON only operators (`:=`/`:=@`). ([#1212](https://github.com/httpie/httpie/issues/1212))
-- Added support for automatically enabling `--stream` when `Content-Type` is `text/event-stream`. ([#376](https://github.com/httpie/httpie/issues/376))
-- Added support for displaying the total elapsed time through `--meta`/`-vv` or `--print=m`. ([#243](https://github.com/httpie/httpie/issues/243))
-- Added new `pie-dark`/`pie-light` (and `pie`) styles that match with [HTTPie for Web and Desktop](https://httpie.io/product). ([#1237](https://github.com/httpie/httpie/issues/1237))
-- Added support for better error handling on DNS failures. ([#1248](https://github.com/httpie/httpie/issues/1248))
-- Added support for storing prompted passwords in the local sessions. ([#1098](https://github.com/httpie/httpie/issues/1098))
-- Added warnings about the `--ignore-stdin`, when there is no incoming data from stdin. ([#1255](https://github.com/httpie/httpie/issues/1255))
-- Fixed crashing due to broken plugins. ([#1204](https://github.com/httpie/httpie/issues/1204))
-- Fixed auto addition of XML declaration to every formatted XML response. ([#1156](https://github.com/httpie/httpie/issues/1156))
-- Fixed highlighting when `Content-Type` specifies `charset`. ([#1242](https://github.com/httpie/httpie/issues/1242))
-- Fixed an unexpected crash when `--raw` is used with `--chunked`. ([#1253](https://github.com/httpie/httpie/issues/1253))
-- Changed the default Windows theme from `fruity` to `auto`. ([#1266](https://github.com/httpie/httpie/issues/1266))
-
-## [2.6.0](https://github.com/httpie/httpie/compare/2.5.0...2.6.0) (2021-10-14)
+- Dropped support for Python 3.6. ([#1177](https://github.com/httpie/cli/issues/1177))
+- Improved startup time by 40%. ([#1211](https://github.com/httpie/cli/pull/1211))
+- Added support for nested JSON syntax. ([#1169](https://github.com/httpie/cli/issues/1169))
+- Added `httpie plugins` interface for plugin management. ([#566](https://github.com/httpie/cli/issues/566))
+- Added support for Bearer authentication via `--auth-type=bearer` ([#1215](https://github.com/httpie/cli/issues/1215)).
+- Added support for quick conversions of pasted URLs into HTTPie calls by adding a space after the protocol name (`$ https ://pie.dev` → `https://pie.dev`). ([#1195](https://github.com/httpie/cli/issues/1195))
+- Added support for _sending_ multiple HTTP header lines with the same name. ([#130](https://github.com/httpie/cli/issues/130))
+- Added support for _receiving_ multiple HTTP headers lines with the same name. ([#1207](https://github.com/httpie/cli/issues/1207))
+- Added support for basic JSON types on `--form`/`--multipart` when using JSON only operators (`:=`/`:=@`). ([#1212](https://github.com/httpie/cli/issues/1212))
+- Added support for automatically enabling `--stream` when `Content-Type` is `text/event-stream`. ([#376](https://github.com/httpie/cli/issues/376))
+- Added support for displaying the total elapsed time through `--meta`/`-vv` or `--print=m`. ([#243](https://github.com/httpie/cli/issues/243))
+- Added new `pie-dark`/`pie-light` (and `pie`) styles that match with [HTTPie for Web and Desktop](https://httpie.io/product). ([#1237](https://github.com/httpie/cli/issues/1237))
+- Added support for better error handling on DNS failures. ([#1248](https://github.com/httpie/cli/issues/1248))
+- Added support for storing prompted passwords in the local sessions. ([#1098](https://github.com/httpie/cli/issues/1098))
+- Added warnings about the `--ignore-stdin`, when there is no incoming data from stdin. ([#1255](https://github.com/httpie/cli/issues/1255))
+- Fixed crashing due to broken plugins. ([#1204](https://github.com/httpie/cli/issues/1204))
+- Fixed auto addition of XML declaration to every formatted XML response. ([#1156](https://github.com/httpie/cli/issues/1156))
+- Fixed highlighting when `Content-Type` specifies `charset`. ([#1242](https://github.com/httpie/cli/issues/1242))
+- Fixed an unexpected crash when `--raw` is used with `--chunked`. ([#1253](https://github.com/httpie/cli/issues/1253))
+- Changed the default Windows theme from `fruity` to `auto`. ([#1266](https://github.com/httpie/cli/issues/1266))
+
+## [2.6.0](https://github.com/httpie/cli/compare/2.5.0...2.6.0) (2021-10-14)
 
 [What’s new in HTTPie for Terminal 2.6.0 →](https://httpie.io/blog/httpie-2.6.0)
 
-- Added support for formatting & coloring of JSON bodies preceded by non-JSON data (e.g., an XXSI prefix). ([#1130](https://github.com/httpie/httpie/issues/1130))
-- Added charset auto-detection when `Content-Type` doesn’t include it. ([#1110](https://github.com/httpie/httpie/issues/1110), [#1168](https://github.com/httpie/httpie/issues/1168))
-- Added `--response-charset` to allow overriding the response encoding for terminal display purposes. ([#1168](https://github.com/httpie/httpie/issues/1168))
-- Added `--response-mime` to allow overriding the response mime type for coloring and formatting for the terminal. ([#1168](https://github.com/httpie/httpie/issues/1168))
-- Added the ability to silence warnings through using `-q` or `--quiet` twice (e.g. `-qq`) ([#1175](https://github.com/httpie/httpie/issues/1175))
-- Added installed plugin list to `--debug` output. ([#1165](https://github.com/httpie/httpie/issues/1165))
-- Fixed duplicate keys preservation in JSON data. ([#1163](https://github.com/httpie/httpie/issues/1163))
+- Added support for formatting & coloring of JSON bodies preceded by non-JSON data (e.g., an XXSI prefix). ([#1130](https://github.com/httpie/cli/issues/1130))
+- Added charset auto-detection when `Content-Type` doesn’t include it. ([#1110](https://github.com/httpie/cli/issues/1110), [#1168](https://github.com/httpie/cli/issues/1168))
+- Added `--response-charset` to allow overriding the response encoding for terminal display purposes. ([#1168](https://github.com/httpie/cli/issues/1168))
+- Added `--response-mime` to allow overriding the response mime type for coloring and formatting for the terminal. ([#1168](https://github.com/httpie/cli/issues/1168))
+- Added the ability to silence warnings through using `-q` or `--quiet` twice (e.g. `-qq`) ([#1175](https://github.com/httpie/cli/issues/1175))
+- Added installed plugin list to `--debug` output. ([#1165](https://github.com/httpie/cli/issues/1165))
+- Fixed duplicate keys preservation in JSON data. ([#1163](https://github.com/httpie/cli/issues/1163))
 
-## [2.5.0](https://github.com/httpie/httpie/compare/2.4.0...2.5.0) (2021-09-06)
+## [2.5.0](https://github.com/httpie/cli/compare/2.4.0...2.5.0) (2021-09-06)
 
 [What’s new in HTTPie for Terminal 2.5.0 →](https://httpie.io/blog/httpie-2.5.0)
 
 - Added `--raw` to allow specifying the raw request body without extra processing as
-  an alternative to `stdin`. ([#534](https://github.com/httpie/httpie/issues/534))
-- Added support for XML formatting. ([#1129](https://github.com/httpie/httpie/issues/1129))
-- Added internal support for file-like object responses to improve adapter plugin support. ([#1094](https://github.com/httpie/httpie/issues/1094))
-- Fixed `--continue --download` with a single byte to be downloaded left. ([#1032](https://github.com/httpie/httpie/issues/1032))
-- Fixed `--verbose` HTTP 307 redirects with streamed request body. ([#1088](https://github.com/httpie/httpie/issues/1088))
-- Fixed handling of session files with `Cookie:` followed by other headers. ([#1126](https://github.com/httpie/httpie/issues/1126))
+  an alternative to `stdin`. ([#534](https://github.com/httpie/cli/issues/534))
+- Added support for XML formatting. ([#1129](https://github.com/httpie/cli/issues/1129))
+- Added internal support for file-like object responses to improve adapter plugin support. ([#1094](https://github.com/httpie/cli/issues/1094))
+- Fixed `--continue --download` with a single byte to be downloaded left. ([#1032](https://github.com/httpie/cli/issues/1032))
+- Fixed `--verbose` HTTP 307 redirects with streamed request body. ([#1088](https://github.com/httpie/cli/issues/1088))
+- Fixed handling of session files with `Cookie:` followed by other headers. ([#1126](https://github.com/httpie/cli/issues/1126))
 
-## [2.4.0](https://github.com/httpie/httpie/compare/2.3.0...2.4.0) (2021-02-06)
+## [2.4.0](https://github.com/httpie/cli/compare/2.3.0...2.4.0) (2021-02-06)
 
-- Added support for `--session` cookie expiration based on `Set-Cookie: max-age=<n>`. ([#1029](https://github.com/httpie/httpie/issues/1029))
-- Show a `--check-status` warning with `--quiet` as well, not only when the output is redirected. ([#1026](https://github.com/httpie/httpie/issues/1026))
-- Fixed upload with `--session` ([#1020](https://github.com/httpie/httpie/issues/1020)).
-- Fixed a missing blank line between request and response ([#1006](https://github.com/httpie/httpie/issues/1006)).
+- Added support for `--session` cookie expiration based on `Set-Cookie: max-age=<n>`. ([#1029](https://github.com/httpie/cli/issues/1029))
+- Show a `--check-status` warning with `--quiet` as well, not only when the output is redirected. ([#1026](https://github.com/httpie/cli/issues/1026))
+- Fixed upload with `--session` ([#1020](https://github.com/httpie/cli/issues/1020)).
+- Fixed a missing blank line between request and response ([#1006](https://github.com/httpie/cli/issues/1006)).
 
-## [2.3.0](https://github.com/httpie/httpie/compare/2.2.0...2.3.0) (2020-10-25)
+## [2.3.0](https://github.com/httpie/cli/compare/2.2.0...2.3.0) (2020-10-25)
 
-- Added support for streamed uploads ([#201](https://github.com/httpie/httpie/issues/201)).
-- Added support for multipart upload streaming ([#684](https://github.com/httpie/httpie/issues/684)).
+- Added support for streamed uploads ([#201](https://github.com/httpie/cli/issues/201)).
+- Added support for multipart upload streaming ([#684](https://github.com/httpie/cli/issues/684)).
 - Added support for body-from-file upload streaming (`http pie.dev/post @file`).
-- Added `--chunked` to enable chunked transfer encoding ([#753](https://github.com/httpie/httpie/issues/753)).
+- Added `--chunked` to enable chunked transfer encoding ([#753](https://github.com/httpie/cli/issues/753)).
 - Added `--multipart` to allow `multipart/form-data` encoding for non-file `--form` requests as well.
-- Added support for preserving field order in multipart requests ([#903](https://github.com/httpie/httpie/issues/903)).
+- Added support for preserving field order in multipart requests ([#903](https://github.com/httpie/cli/issues/903)).
 - Added `--boundary` to allow a custom boundary string for `multipart/form-data` requests.
-- Added support for combining cookies specified on the CLI and in a session file ([#932](https://github.com/httpie/httpie/issues/932)).
-- Added out of the box SOCKS support with no extra installation ([#904](https://github.com/httpie/httpie/issues/904)).
+- Added support for combining cookies specified on the CLI and in a session file ([#932](https://github.com/httpie/cli/issues/932)).
+- Added out of the box SOCKS support with no extra installation ([#904](https://github.com/httpie/cli/issues/904)).
 - Added `--quiet, -q` flag to enforce silent behaviour.
-- Fixed the handling of invalid `expires` dates in `Set-Cookie` headers ([#963](https://github.com/httpie/httpie/issues/963)).
-- Removed Tox testing entirely ([#943](https://github.com/httpie/httpie/issues/943)).
+- Fixed the handling of invalid `expires` dates in `Set-Cookie` headers ([#963](https://github.com/httpie/cli/issues/963)).
+- Removed Tox testing entirely ([#943](https://github.com/httpie/cli/issues/943)).
 
-## [2.2.0](https://github.com/httpie/httpie/compare/2.1.0...2.2.0) (2020-06-18)
+## [2.2.0](https://github.com/httpie/cli/compare/2.1.0...2.2.0) (2020-06-18)
 
-- Added support for custom content types for uploaded files ([#668](https://github.com/httpie/httpie/issues/668)).
-- Added support for `$XDG_CONFIG_HOME` ([#920](https://github.com/httpie/httpie/issues/920)).
-- Added support for `Set-Cookie`-triggered cookie expiration ([#853](https://github.com/httpie/httpie/issues/853)).
-- Added `--format-options` to allow disabling sorting, etc. ([#128](https://github.com/httpie/httpie/issues/128))
-- Added `--sorted` and `--unsorted` shortcuts for (un)setting all sorting-related `--format-options`. ([#128](https://github.com/httpie/httpie/issues/128))
-- Added `--ciphers` to allow configuring OpenSSL ciphers ([#870](https://github.com/httpie/httpie/issues/870)).
+- Added support for custom content types for uploaded files ([#668](https://github.com/httpie/cli/issues/668)).
+- Added support for `$XDG_CONFIG_HOME` ([#920](https://github.com/httpie/cli/issues/920)).
+- Added support for `Set-Cookie`-triggered cookie expiration ([#853](https://github.com/httpie/cli/issues/853)).
+- Added `--format-options` to allow disabling sorting, etc. ([#128](https://github.com/httpie/cli/issues/128))
+- Added `--sorted` and `--unsorted` shortcuts for (un)setting all sorting-related `--format-options`. ([#128](https://github.com/httpie/cli/issues/128))
+- Added `--ciphers` to allow configuring OpenSSL ciphers ([#870](https://github.com/httpie/cli/issues/870)).
 - Added `netrc` support for auth plugins. Enabled for `--auth-type=basic`
-  and `digest`, 3rd parties may opt in ([#718](https://github.com/httpie/httpie/issues/718), [#719](https://github.com/httpie/httpie/issues/719), [#852](https://github.com/httpie/httpie/issues/852), [#934](https://github.com/httpie/httpie/issues/934)).
-- Fixed built-in plugins-related circular imports ([#925](https://github.com/httpie/httpie/issues/925)).
+  and `digest`, 3rd parties may opt in ([#718](https://github.com/httpie/cli/issues/718), [#719](https://github.com/httpie/cli/issues/719), [#852](https://github.com/httpie/cli/issues/852), [#934](https://github.com/httpie/cli/issues/934)).
+- Fixed built-in plugins-related circular imports ([#925](https://github.com/httpie/cli/issues/925)).
 
-## [2.1.0](https://github.com/httpie/httpie/compare/2.0.0...2.1.0) (2020-04-18)
+## [2.1.0](https://github.com/httpie/cli/compare/2.0.0...2.1.0) (2020-04-18)
 
 - Added `--path-as-is` to bypass dot segment (`/../` or `/./`)
-  URL squashing ([#895](https://github.com/httpie/httpie/issues/895)).
+  URL squashing ([#895](https://github.com/httpie/cli/issues/895)).
 - Changed the default `Accept` header value for JSON requests from
   `application/json, */*` to `application/json, */*;q=0.5`
-  to clearly indicate preference ([#488](https://github.com/httpie/httpie/issues/488)).
+  to clearly indicate preference ([#488](https://github.com/httpie/cli/issues/488)).
 - Fixed `--form` file upload mixed with redirected `stdin` error handling
-  ([#840](https://github.com/httpie/httpie/issues/840)).
+  ([#840](https://github.com/httpie/cli/issues/840)).
 
-## [2.0.0](https://github.com/httpie/httpie/compare/1.0.3...2.0.0) (2020-01-12)
+## [2.0.0](https://github.com/httpie/cli/compare/1.0.3...2.0.0) (2020-01-12)
 
 - Removed Python 2.7 support ([EOL Jan 2020](https://www.python.org/doc/sunset-python-2/).
 - Added `--offline` to allow building an HTTP request and printing it but not
@@ -131,7 +175,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Fixed an error when `stdin` was a closed fd.
 - Improved `--debug` output formatting.
 
-## [1.0.3](https://github.com/httpie/httpie/compare/1.0.2...1.0.3) (2019-08-26)
+## [1.0.3](https://github.com/httpie/cli/compare/1.0.2...1.0.3) (2019-08-26)
 
 - Fixed CVE-2019-10751 — the way the output filename is generated for
   `--download` requests without `--output` resulting in a redirect has
@@ -157,15 +201,15 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
   Reported by Raul Onitza and Giulio Comi.
 
-## [1.0.2](https://github.com/httpie/httpie/compare/1.0.1...1.0.2) (2018-11-14)
+## [1.0.2](https://github.com/httpie/cli/compare/1.0.1...1.0.2) (2018-11-14)
 
 - Fixed tests for installation with pyOpenSSL.
 
-## [1.0.1](https://github.com/httpie/httpie/compare/1.0.0...1.0.1) (2018-11-14)
+## [1.0.1](https://github.com/httpie/cli/compare/1.0.0...1.0.1) (2018-11-14)
 
 - Removed external URL calls from tests.
 
-## [1.0.0](https://github.com/httpie/httpie/compare/0.9.9...1.0.0) (2018-11-02)
+## [1.0.0](https://github.com/httpie/cli/compare/0.9.9...1.0.0) (2018-11-02)
 
 - Added `--style=auto` which follows the terminal ANSI color styles.
 - Added support for selecting TLS 1.3 via `--ssl=tls1.3`
@@ -176,11 +220,11 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Fixed default headers being incorrectly case-sensitive.
 - Removed Python 2.6 support.
 
-## [0.9.9](https://github.com/httpie/httpie/compare/0.9.8...0.9.9) (2016-12-08)
+## [0.9.9](https://github.com/httpie/cli/compare/0.9.8...0.9.9) (2016-12-08)
 
 - Fixed README.
 
-## [0.9.8](https://github.com/httpie/httpie/compare/0.9.6...0.9.8) (2016-12-08)
+## [0.9.8](https://github.com/httpie/cli/compare/0.9.6...0.9.8) (2016-12-08)
 
 - Extended auth plugin API.
 - Added exit status code `7` for plugin errors.
@@ -189,7 +233,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Improved `CTRL-C` interrupt handling.
 - Added the standard exit status code `130` for keyboard interrupts.
 
-## [0.9.6](https://github.com/httpie/httpie/compare/0.9.4...0.9.6) (2016-08-13)
+## [0.9.6](https://github.com/httpie/cli/compare/0.9.4...0.9.6) (2016-08-13)
 
 - Added Python 3 as a dependency for Homebrew installations
   to ensure some of the newer HTTP features work out of the box
@@ -208,7 +252,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Changed the pre-processing of request HTTP headers so that any leading
   and trailing whitespace is removed.
 
-## [0.9.4](https://github.com/httpie/httpie/compare/0.9.3...0.9.4) (2016-07-01)
+## [0.9.4](https://github.com/httpie/cli/compare/0.9.3...0.9.4) (2016-07-01)
 
 - Added `Content-Type` of files uploaded in `multipart/form-data` requests
 - Added `--ssl=<PROTOCOL>` to specify the desired SSL/TLS protocol version
@@ -232,7 +276,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Fixed the handling of `Content-Type` with multiple `+subtype` parts
 - Removed the XML formatter as the implementation suffered from multiple issues
 
-## [0.9.3](https://github.com/httpie/httpie/compare/0.9.2...0.9.3) (2016-01-01)
+## [0.9.3](https://github.com/httpie/cli/compare/0.9.2...0.9.3) (2016-01-01)
 
 - Changed the default color `--style` from `solarized` to `monokai`
 - Added basic Bash autocomplete support (need to be installed manually)
@@ -242,19 +286,19 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Fixed colors and formatting on Windows
 - Fixed `--auth` prompt on Windows
 
-## [0.9.2](https://github.com/httpie/httpie/compare/0.9.1...0.9.2) (2015-02-24)
+## [0.9.2](https://github.com/httpie/cli/compare/0.9.1...0.9.2) (2015-02-24)
 
 - Fixed compatibility with Requests 2.5.1
 - Changed the default JSON `Content-Type` to `application/json` as UTF-8
   is the default JSON encoding
 
-## [0.9.1](https://github.com/httpie/httpie/compare/0.9.0...0.9.1) (2015-02-07)
+## [0.9.1](https://github.com/httpie/cli/compare/0.9.0...0.9.1) (2015-02-07)
 
 - Added support for Requests transport adapter plugins
   (see [httpie-unixsocket](https://github.com/httpie/httpie-unixsocket)
   and [httpie-http2](https://github.com/httpie/httpie-http2))
 
-## [0.9.0](https://github.com/httpie/httpie/compare/0.8.0...0.9.0) (2015-01-31)
+## [0.9.0](https://github.com/httpie/cli/compare/0.8.0...0.9.0) (2015-01-31)
 
 - Added `--cert` and `--cert-key` parameters to specify a client side
   certificate and private key for SSL
@@ -273,7 +317,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Fixed `--output=/dev/null` on Linux
 - Miscellaneous bugfixes
 
-## [0.8.0](https://github.com/httpie/httpie/compare/0.7.1...0.8.0) (2014-01-25)
+## [0.8.0](https://github.com/httpie/cli/compare/0.7.1...0.8.0) (2014-01-25)
 
 - Added `field=@file.txt` and `field:=@file.json` for embedding
   the contents of text and JSON files into request data
@@ -281,7 +325,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Fixed request `Host` header value output so that it doesn't contain
   credentials, if included in the URL
 
-## [0.7.1](https://github.com/httpie/httpie/compare/0.6.0...0.7.1) (2013-09-24)
+## [0.7.1](https://github.com/httpie/cli/compare/0.6.0...0.7.1) (2013-09-24)
 
 - Added `--ignore-stdin`
 - Added support for auth plugins
@@ -289,27 +333,27 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Improved `Content-Disposition` parsing for `--download` mode
 - Update to Requests 2.0.0
 
-## [0.6.0](https://github.com/httpie/httpie/compare/0.5.1...0.6.0) (2013-06-03)
+## [0.6.0](https://github.com/httpie/cli/compare/0.5.1...0.6.0) (2013-06-03)
 
 - XML data is now formatted
 - `--session` and `--session-read-only` now also accept paths to
   session files (eg. `http --session=/tmp/session.json example.org`)
 
-## [0.5.1](https://github.com/httpie/httpie/compare/0.5.0...0.5.1) (2013-05-13)
+## [0.5.1](https://github.com/httpie/cli/compare/0.5.0...0.5.1) (2013-05-13)
 
 - `Content-*` and `If-*` request headers are not stored in sessions
   anymore as they are request-specific
 
-## [0.5.0](https://github.com/httpie/httpie/compare/0.4.1...0.5.0) (2013-04-27)
+## [0.5.0](https://github.com/httpie/cli/compare/0.4.1...0.5.0) (2013-04-27)
 
 - Added a download mode via `--download`
 - Fixes miscellaneous bugs
 
-## [0.4.1](https://github.com/httpie/httpie/compare/0.4.0...0.4.1) (2013-02-26)
+## [0.4.1](https://github.com/httpie/cli/compare/0.4.0...0.4.1) (2013-02-26)
 
 - Fixed `setup.py`
 
-## [0.4.0](https://github.com/httpie/httpie/compare/0.3.0...0.4.0) (2013-02-22)
+## [0.4.0](https://github.com/httpie/cli/compare/0.3.0...0.4.0) (2013-02-22)
 
 - Added Python 3.3 compatibility
 - Added Requests >= v1.0.4 compatibility
@@ -318,7 +362,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Mutually exclusive arguments can be specified multiple times. The
   last value is used
 
-## [0.3.0](https://github.com/httpie/httpie/compare/0.2.7...0.3.0) (2012-09-21)
+## [0.3.0](https://github.com/httpie/cli/compare/0.2.7...0.3.0) (2012-09-21)
 
 - Allow output redirection on Windows
 - Added configuration file
@@ -333,7 +377,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
   (`--pretty=all`, `--pretty=colors` and `--pretty=format`)
   `--ugly` has bee removed in favor of `--pretty=none`
 
-## [0.2.7](https://github.com/httpie/httpie/compare/0.2.5...0.2.7) (2012-08-07)
+## [0.2.7](https://github.com/httpie/cli/compare/0.2.5...0.2.7) (2012-08-07)
 
 - Added compatibility with Requests 0.13.6
 - Added streamed terminal output. `--stream, -S` can be used to enable
@@ -350,7 +394,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Fixed printing of `multipart/form-data` requests
 - Renamed `--traceback` to `--debug`
 
-## [0.2.6](https://github.com/httpie/httpie/compare/0.2.5...0.2.6) (2012-07-26)
+## [0.2.6](https://github.com/httpie/cli/compare/0.2.5...0.2.6) (2012-07-26)
 
 - The short option for `--headers` is now `-h` (`-t` has been
   removed, for usage use `--help`)
@@ -365,7 +409,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Added query string parameters (`param==value`)
 - Added support for terminal colors under Windows
 
-## [0.2.5](https://github.com/httpie/httpie/compare/0.2.2...0.2.5) (2012-07-17)
+## [0.2.5](https://github.com/httpie/cli/compare/0.2.2...0.2.5) (2012-07-17)
 
 - Unicode characters in prettified JSON now don't get escaped for
   improved readability
@@ -376,20 +420,20 @@ This project adheres to [Semantic Versioning](https://semver.org/).
   `--verbose`
 - Fixed Content-Type for requests with no data
 
-## [0.2.2](https://github.com/httpie/httpie/compare/0.2.1...0.2.2) (2012-06-24)
+## [0.2.2](https://github.com/httpie/cli/compare/0.2.1...0.2.2) (2012-06-24)
 
 - The `METHOD` positional argument can now be omitted (defaults to
   `GET`, or to `POST` with data)
 - Fixed --verbose --form
 - Added support for Tox
 
-## [0.2.1](https://github.com/httpie/httpie/compare/0.2.0...0.2.1) (2012-06-13)
+## [0.2.1](https://github.com/httpie/cli/compare/0.2.0...0.2.1) (2012-06-13)
 
 - Added compatibility with `requests-0.12.1`
 - Dropped custom JSON and HTTP lexers in favor of the ones newly included
   in `pygments-1.5`
 
-## [0.2.0](https://github.com/httpie/httpie/compare/0.1.6...0.2.0) (2012-04-25)
+## [0.2.0](https://github.com/httpie/cli/compare/0.1.6...0.2.0) (2012-04-25)
 
 - Added Python 3 support
 - Added the ability to print the HTTP request as well as the response
@@ -401,18 +445,18 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Added support for field name escaping
 - Many bug fixes
 
-## [0.1.6](https://github.com/httpie/httpie/compare/0.1.5...0.1.6) (2012-03-04)
+## [0.1.6](https://github.com/httpie/cli/compare/0.1.5...0.1.6) (2012-03-04)
 
 - Fixed `setup.py`
 
-## [0.1.5](https://github.com/httpie/httpie/compare/0.1.4...0.1.5) (2012-03-04)
+## [0.1.5](https://github.com/httpie/cli/compare/0.1.4...0.1.5) (2012-03-04)
 
 - Many improvements and bug fixes
 
-## [0.1.4](https://github.com/httpie/httpie/compare/b966efa...0.1.4) (2012-02-28)
+## [0.1.4](https://github.com/httpie/cli/compare/b966efa...0.1.4) (2012-02-28)
 
 - Many improvements and bug fixes
 
-## [0.1.0](https://github.com/httpie/httpie/commit/b966efa) (2012-02-25)
+## [0.1.0](https://github.com/httpie/cli/commit/b966efa) (2012-02-25)
 
 - Initial public release
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 555aa913b9..1360184a8b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,7 +19,7 @@ $ http --debug <COMPLETE ARGUMENT LIST THAT TRIGGERS THE ERROR>
 
 ## 2. Contributing Code and Docs
 
-Before working on a new feature or a bug, please browse [existing issues](https://github.com/httpie/httpie/issues)
+Before working on a new feature or a bug, please browse [existing issues](https://github.com/httpie/cli/issues)
 to see whether it has previously been discussed.
 
 If your change alters HTTPie’s behaviour or interface, it's a good idea to
@@ -38,13 +38,13 @@ for existing-yet-previously-untested behavior will very likely be merged.
 Therefore, docs and tests improvements are a great candidate for your first
 contribution.
 
-Consider also adding a [CHANGELOG](https://github.com/httpie/httpie/blob/master/CHANGELOG.md) entry for your changes.
+Consider also adding a [CHANGELOG](https://github.com/httpie/cli/blob/master/CHANGELOG.md) entry for your changes.
 
 ### Development Environment
 
 #### Getting the code
 
-Go to <https://github.com/httpie/httpie> and fork the project repository.
+Go to <https://github.com/httpie/cli> and fork the project repository.
 
 ```bash
 # Clone your fork
@@ -59,8 +59,10 @@ $ git checkout -b my_topical_branch
 
 #### Setup
 
-The [Makefile](https://github.com/httpie/httpie/blob/master/Makefile) contains a bunch of tasks to get you started. Just run
-the following command, which:
+The [Makefile](https://github.com/httpie/cli/blob/master/Makefile) contains a bunch of tasks to get you started.
+You can run `$ make` to see all the available tasks.
+
+To get started, run the command below, which:
 
 - Creates an isolated Python virtual environment inside `./venv`
   (via the standard library [venv](https://docs.python.org/3/library/venv.html) tool);
@@ -70,7 +72,7 @@ the following command, which:
 - and runs tests (It is the same as running `make install test`).
 
 ```bash
-$ make
+$ make all
 ```
 
 #### Python virtual environment
@@ -110,7 +112,7 @@ and that `make pycodestyle` passes.
 
 Please add tests for any new features and bug fixes.
 
-When you open a Pull Request, [GitHub Actions](https://github.com/httpie/httpie/actions) will automatically run HTTPie’s [test suite](https://github.com/httpie/httpie/tree/master/tests) against your code, so please make sure all checks pass.
+When you open a Pull Request, [GitHub Actions](https://github.com/httpie/cli/actions) will automatically run HTTPie’s [test suite](https://github.com/httpie/cli/tree/master/tests) against your code, so please make sure all checks pass.
 
 #### Running tests locally
 
@@ -142,7 +144,7 @@ $ python -m pytest tests/test_uploads.py::TestMultipartFormDataFileUpload
 $ python -m pytest tests/test_uploads.py::TestMultipartFormDataFileUpload::test_upload_ok
 ```
 
-See [Makefile](https://github.com/httpie/httpie/blob/master/Makefile) for additional development utilities.
+See [Makefile](https://github.com/httpie/cli/blob/master/Makefile) for additional development utilities.
 
 #### Running benchmarks
 
@@ -152,7 +154,7 @@ with the master branch of your repository (or a fresh checkout of HTTPie master,
 `--fresh`) and report the results back.
 
 ```bash
-$ python extras/benchmarks/run.py
+$ python extras/profiling/run.py
 ```
 
 The benchmarks can also be run on the CI. Since it is a long process, it requires manual
@@ -207,4 +209,4 @@ $ python -m pytest
 
 ______________________________________________________________________
 
-Finally, feel free to add yourself to [AUTHORS](https://github.com/httpie/httpie/blob/master/AUTHORS.md)!
+Finally, feel free to add yourself to [AUTHORS](https://github.com/httpie/cli/blob/master/AUTHORS.md)!
diff --git a/MANIFEST.in b/MANIFEST.in
index e166aa09fb..a09a3037eb 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,5 +4,5 @@ include CHANGELOG.md
 include AUTHORS.md
 include docs/README.md
 
-# <https://github.com/httpie/httpie/issues/182>
+# <https://github.com/httpie/cli/issues/182>
 recursive-include tests/ *
diff --git a/Makefile b/Makefile
index 0e5c1a1217..a2a80a1778 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,26 @@ VENV_PYTHON=$(VENV_BIN)/python
 export PATH := $(VENV_BIN):$(PATH)
 
 
+
+default: list-tasks
+
+
+###############################################################################
+# Default task to get a list of tasks when `make' is run without args.
+# <https://stackoverflow.com/questions/4219255>
+###############################################################################
+
+list-tasks:
+	@echo Available tasks:
+	@echo ----------------
+	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | grep -E -v -e '^[^[:alnum:]]' -e '^$@$$'
+	@echo
+
+
+###############################################################################
+# Installation
+###############################################################################
+
 all: uninstall-httpie install test
 
 
@@ -30,10 +50,10 @@ install: venv install-reqs
 
 install-reqs:
 	@echo $(H1)Updating package tools$(H1END)
-	$(VENV_PIP) install --upgrade pip wheel
+	$(VENV_PIP) install --upgrade pip wheel build
 
 	@echo $(H1)Installing dev requirements$(H1END)
-	$(VENV_PIP) install --upgrade --editable '.[dev]'
+	$(VENV_PIP) install --upgrade '.[dev]' '.[test]'
 
 	@echo $(H1)Installing HTTPie$(H1END)
 	$(VENV_PIP) install --upgrade --editable .
@@ -104,7 +124,8 @@ test-dist: test-sdist test-bdist-wheel
 
 test-sdist: clean venv
 	@echo $(H1)Testing sdist build an installation$(H1END)
-	$(VENV_PYTHON) setup.py sdist
+	$(VENV_PIP) install build
+	$(VENV_PYTHON) -m build --sdist
 	$(VENV_PIP) install --force-reinstall --upgrade dist/*.gz
 	$(VENV_BIN)/http --version
 	@echo
@@ -112,8 +133,8 @@ test-sdist: clean venv
 
 test-bdist-wheel: clean venv
 	@echo $(H1)Testing wheel build an installation$(H1END)
-	$(VENV_PIP) install wheel
-	$(VENV_PYTHON) setup.py bdist_wheel
+	$(VENV_PIP) install build
+	$(VENV_PYTHON) -m build --wheel
 	$(VENV_PIP) install --force-reinstall --upgrade dist/*.whl
 	$(VENV_BIN)/http --version
 	@echo
@@ -147,19 +168,17 @@ doc-check:
 	mdl --git-recurse --style docs/markdownlint.rb .
 
 
-doc-update-install:
-	@echo $(H1)Updating installation instructions in the docs$(H1END)
-	$(VENV_PYTHON) docs/installation/generate.py
-
-
 ###############################################################################
 # Publishing to PyPi
 ###############################################################################
 
 
 build:
-	rm -rf build/
-	$(VENV_PYTHON) setup.py sdist bdist_wheel
+	rm -rf build/ dist/
+	mv httpie/internal/__build_channel__.py httpie/internal/__build_channel__.py.original
+	echo 'BUILD_CHANNEL = "pip"' > httpie/internal/__build_channel__.py
+	$(VENV_PYTHON) -m build --sdist --wheel --outdir dist/
+	mv httpie/internal/__build_channel__.py.original httpie/internal/__build_channel__.py
 
 
 publish: test-all publish-no-test
@@ -203,7 +222,7 @@ brew-test:
 	- brew uninstall httpie
 
 	@echo $(H1)Building from source…$(H1END)
-	- brew install --build-from-source ./docs/packaging/brew/httpie.rb
+	- brew install --HEAD --build-from-source ./docs/packaging/brew/httpie.rb
 
 	@echo $(H1)Verifying…$(H1END)
 	http --version
@@ -211,3 +230,17 @@ brew-test:
 
 	@echo $(H1)Auditing…$(H1END)
 	brew audit --strict httpie
+
+###############################################################################
+# Generated content
+###############################################################################
+
+content: man installation-docs
+
+man: install
+	@echo $(H1)Regenerate man pages$(H1END)
+	$(VENV_PYTHON) extras/scripts/generate_man_pages.py
+
+installation-docs:
+	@echo $(H1)Updating installation instructions in the docs$(H1END)
+	$(VENV_PYTHON) docs/installation/generate.py
diff --git a/README.md b/README.md
index 9b8d0b58eb..13a3503b41 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,31 @@
-<br/>
-<a href="https://httpie.io" target="blank_">
-    <img height="100" alt="HTTPie" src="https://raw.githubusercontent.com/httpie/httpie/master/docs/httpie-logo.svg" />
-</a>
-<br/>
+<h2 align="center">
+    <a href="https://httpie.io" target="blank_">
+        <img height="100" alt="HTTPie" src="https://raw.githubusercontent.com/httpie/cli/master/docs/httpie-logo.svg" />
+    </a>
+    <br>
+    HTTPie CLI: human-friendly HTTP client for the API era
+</h2>
+
+<div align="center">
+
+[![HTTPie for Desktop](https://img.shields.io/static/v1?label=HTTPie&message=Desktop&color=4B78E6)](https://httpie.io/product)
+[![](https://img.shields.io/static/v1?label=HTTPie&message=Web%20%26%20Mobile&color=73DC8C)](https://httpie.io/app)
+[![](https://img.shields.io/static/v1?label=HTTPie&message=CLI&color=FA9BFA)](https://httpie.io/cli)
+[![Twitter](https://img.shields.io/twitter/follow/httpie?style=flat&color=%234B78E6&logoColor=%234B78E6)](https://twitter.com/httpie)
+[![Chat](https://img.shields.io/discord/725351238698270761?style=flat&label=Chat%20on%20Discord&color=%23FA9BFA)](https://httpie.io/discord)
+
+</div>
+
 
-# HTTPie: human-friendly CLI HTTP client for the API era
+<div align="center">
+
+[![Docs](https://img.shields.io/badge/stable%20docs-httpie.io%2Fdocs%2Fcli-brightgreen?style=flat&color=%2373DC8C&label=Docs)](https://httpie.org/docs/cli)
+[![Latest version](https://img.shields.io/pypi/v/httpie.svg?style=flat&label=Latest&color=%234B78E6&logo=&logoColor=white)](https://pypi.python.org/pypi/httpie)
+[![Build](https://img.shields.io/github/actions/workflow/status/httpie/cli/tests.yml?branch=master&color=%23FA9BFA&label=Build)](https://github.com/httpie/cli/actions)
+[![Coverage](https://img.shields.io/codecov/c/github/httpie/cli?style=flat&label=Coverage&color=%2373DC8C)](https://codecov.io/gh/httpie/cli)
+[![PyPi downloads](https://img.shields.io/pepy/dt/httpie?style=flat&label=Downloads%20from%20PyPi%20only&color=4B78E6)](https://www.pepy.tech/projects/httpie)
+
+</div>
 
 HTTPie (pronounced _aitch-tee-tee-pie_) is a command-line HTTP client.
 Its goal is to make CLI interaction with web services as human-friendly as possible.
@@ -12,14 +33,22 @@ HTTPie is designed for testing, debugging, and generally interacting with APIs &
 The `http` & `https` commands allow for creating and sending arbitrary HTTP requests.
 They use simple and natural syntax and provide formatted and colorized output.
 
-[![Docs](https://img.shields.io/badge/stable%20docs-httpie.io%2Fdocs-brightgreen?style=flat&color=%2373DC8C&label=Docs)](https://httpie.org/docs)
-[![Latest version](https://img.shields.io/pypi/v/httpie.svg?style=flat&label=Latest&color=%234B78E6&logo=&logoColor=white)](https://pypi.python.org/pypi/httpie)
-[![Build](https://img.shields.io/github/workflow/status/httpie/httpie/Build?color=%23FA9BFA&label=Build)](https://github.com/httpie/httpie/actions)
-[![Coverage](https://img.shields.io/codecov/c/github/httpie/httpie?style=flat&label=Coverage&color=%2373DC8C)](https://codecov.io/gh/httpie/httpie)
-[![Twitter](https://img.shields.io/twitter/follow/httpie?style=flat&color=%234B78E6&logoColor=%234B78E6)](https://twitter.com/httpie)
-[![Chat](https://img.shields.io/badge/chat-Discord-brightgreen?style=flat&label=Chat%20on&color=%23FA9BFA)](https://httpie.io/discord)
+<div align="center">
+
+<img src="https://raw.githubusercontent.com/httpie/cli/master/docs/httpie-animation.gif" alt="HTTPie in action" width="100%"/>
+
+
+</div>
+
+
+
+
+## We lost 54k GitHub stars
+
+Please note we recently accidentally made this repo private for a moment, and GitHub deleted our community that took a decade to build. Read the full story here: https://httpie.io/blog/stardust
+
+![](docs/stardust.png)
 
-<img src="https://raw.githubusercontent.com/httpie/httpie/master/docs/httpie-animation.gif" alt="HTTPie in action" width="100%"/>
 
 ## Getting started
 
@@ -45,25 +74,25 @@ They use simple and natural syntax and provide formatted and colorized output.
 Hello World:
 
 ```bash
-$ https httpie.io/hello
+https httpie.io/hello
 ```
 
 Custom [HTTP method](https://httpie.io/docs#http-method), [HTTP headers](https://httpie.io/docs#http-headers) and [JSON](https://httpie.io/docs#json) data:
 
 ```bash
-$ http PUT pie.dev/put X-API-Token:123 name=John
+http PUT pie.dev/put X-API-Token:123 name=John
 ```
 
-Build and print a request without sending it using [offline mode](https://httpie.io/docs#offline-mode):
+Build and print a request without sending it using [offline mode](https://httpie.io/docs/cli/offline-mode):
 
 ```bash
-$ http --offline pie.dev/post hello=offline
+http --offline pie.dev/post hello=offline
 ```
 
-Use [GitHub API](https://developer.github.com/v3/issues/comments/#create-a-comment) to post a comment on an [Issue](https://github.com/httpie/httpie/issues/83) with [authentication](https://httpie.io/docs#authentication):
+Use [GitHub API](https://developer.github.com/v3/issues/comments/#create-a-comment) to post a comment on an [Issue](https://github.com/httpie/cli/issues/83) with [authentication](https://httpie.io/docs#authentication):
 
 ```bash
-$ http -a USERNAME POST https://api.github.com/repos/httpie/httpie/issues/83/comments body='HTTPie is awesome! :heart:'
+http -a USERNAME POST https://api.github.com/repos/httpie/cli/issues/83/comments body='HTTPie is awesome! :heart:'
 ```
 
 [See more examples →](https://httpie.io/docs#examples)
@@ -74,11 +103,11 @@ $ http -a USERNAME POST https://api.github.com/repos/httpie/httpie/issues/83/com
 - Join our [Discord server](https://httpie.io/discord) is to ask questions, discuss features, and for general API chat.
 - Tweet at [@httpie](https://twitter.com/httpie) on Twitter.
 - Use [StackOverflow](https://stackoverflow.com/questions/tagged/httpie) to ask questions and include a `httpie` tag.
-- Create [GitHub Issues](https://github.com/httpie/httpie/issues) for bug reports and feature requests.
+- Create [GitHub Issues](https://github.com/httpie/cli/issues) for bug reports and feature requests.
 - Subscribe to the [HTTPie newsletter](https://httpie.io) for occasional updates.
 
 ## Contributing
 
-Have a look through existing [Issues](https://github.com/httpie/httpie/issues) and [Pull Requests](https://github.com/httpie/httpie/pulls) that you could help with. If you'd like to request a feature or report a bug, please [create a GitHub Issue](https://github.com/httpie/httpie/issues) using one of the templates provided.
+Have a look through existing [Issues](https://github.com/httpie/cli/issues) and [Pull Requests](https://github.com/httpie/cli/pulls) that you could help with. If you'd like to request a feature or report a bug, please [create a GitHub Issue](https://github.com/httpie/cli/issues) using one of the templates provided.
 
-[See contribution guide →](https://github.com/httpie/httpie/blob/master/CONTRIBUTING.md)
+[See contribution guide →](https://github.com/httpie/cli/blob/master/CONTRIBUTING.md)
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000000..542bcd7854
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,14 @@
+# Security policy
+
+## Reporting a vulnerability
+
+When you identify a vulnerability in HTTPie, please report it privately using one of the following channels:
+
+- Email to [`security@httpie.io`](mailto:security@httpie.io)
+- Report on [huntr.dev](https://huntr.dev/)
+
+In addition to the description of the vulnerability, include the following information:
+
+- A short reproducer to verify it (it can be a small HTTP server, shell script, docker image, etc.)
+- Your deemed severity level of the vulnerability (`LOW`/`MEDIUM`/`HIGH`/`CRITICAL`)
+- [CWE](https://cwe.mitre.org/) ID, if available.
diff --git a/docs/README.md b/docs/README.md
index 66bb4d6a9d..51dff51aec 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -19,7 +19,7 @@ This documentation is best viewed at [httpie.io/docs](https://httpie.org/docs).
 You can select your corresponding HTTPie version as well as run examples directly from the browser using a [termible.io](https://termible.io?utm_source=httpie-readme) embedded terminal.
 
 If you are reading this on GitHub, then this text covers the current *development* version.
-You are invited to submit fixes and improvements to the docs by editing [this file](https://github.com/httpie/httpie/blob/master/docs/README.md).
+You are invited to submit fixes and improvements to the docs by editing [this file](https://github.com/httpie/cli/blob/master/docs/README.md).
 
 </div>
 
@@ -126,77 +126,94 @@ $ choco upgrade httpie
 
 ### Linux
 
-#### Snapcraft (Linux)
+#### Debian and Ubuntu
 
-To install [Snapcraft](https://snapcraft.io/), see [its installation](https://snapcraft.io/docs/installing-snapd).
+Also works for other Debian-derived distributions like MX Linux, Linux Mint, deepin, Pop!_OS, KDE neon, Zorin OS, elementary OS, Kubuntu, Devuan, Linux Lite, Peppermint OS, Lubuntu, antiX, Xubuntu, etc.
 
 ```bash
 # Install httpie
-$ snap install httpie
+$ curl -SsL https://packages.httpie.io/deb/KEY.gpg | sudo gpg --dearmor -o /usr/share/keyrings/httpie.gpg
+$ echo "deb [arch=amd64 signed-by=/usr/share/keyrings/httpie.gpg] https://packages.httpie.io/deb ./" | sudo tee /etc/apt/sources.list.d/httpie.list > /dev/null
+$ sudo apt update
+$ sudo apt install httpie
 ```
 
 ```bash
 # Upgrade httpie
-$ snap refresh httpie
+$ sudo apt update && sudo apt upgrade httpie
 ```
 
-#### Linuxbrew
+#### Fedora
 
-To install [Linuxbrew](https://docs.brew.sh/Homebrew-on-Linux), see [its installation](https://docs.brew.sh/Homebrew-on-Linux#install).
+```bash
+# Install httpie
+$ dnf install httpie
+```
+
+```bash
+# Upgrade httpie
+$ dnf upgrade httpie
+```
+
+#### CentOS and RHEL
+
+Also works for other RHEL-derived distributions like ClearOS, Oracle Linux, etc.
 
 ```bash
 # Install httpie
-$ brew update
-$ brew install httpie
+$ yum install epel-release
+$ yum install httpie
 ```
 
 ```bash
 # Upgrade httpie
-$ brew update
-$ brew upgrade httpie
+$ yum upgrade httpie
 ```
 
-#### Debian and Ubuntu
+#### Single binary executables
 
-Also works for other Debian-derived distributions like MX Linux, Linux Mint, deepin, Pop!_OS, KDE neon, Zorin OS, elementary OS, Kubuntu, Devuan, Linux Lite, Peppermint OS, Lubuntu, antiX, Xubuntu, etc.
+Get the standalone HTTPie Linux executables when you don't want to go through the full installation process.
 
 ```bash
 # Install httpie
-$ apt update
-$ apt install httpie
+$ https --download packages.httpie.io/binaries/linux/http-latest -o http
+$ ln -ls ./http ./https
+$ chmod +x ./http ./https
 ```
 
 ```bash
 # Upgrade httpie
-$ apt update
-$ apt upgrade httpie
+$ https --download packages.httpie.io/binaries/linux/http-latest -o http
 ```
 
-#### Fedora
+#### Snapcraft (Linux)
+
+To install [Snapcraft](https://snapcraft.io/), see [its installation](https://snapcraft.io/docs/installing-snapd).
 
 ```bash
 # Install httpie
-$ dnf install httpie
+$ snap install httpie
 ```
 
 ```bash
 # Upgrade httpie
-$ dnf upgrade httpie
+$ snap refresh httpie
 ```
 
-#### CentOS and RHEL
+#### Linuxbrew
 
-Also works for other RHEL-derived distributions like ClearOS, Oracle Linux, etc.
+To install [Linuxbrew](https://docs.brew.sh/Homebrew-on-Linux), see [its installation](https://docs.brew.sh/Homebrew-on-Linux#install).
 
 ```bash
 # Install httpie
-$ yum install epel-release
-$ yum install httpie
+$ brew update
+$ brew install httpie
 ```
 
 ```bash
 # Upgrade httpie
-$ yum upgrade httpie
+$ brew update
+$ brew upgrade httpie
 ```
 
 #### Arch Linux
@@ -205,12 +222,12 @@ Also works for other Arch-derived distributions like ArcoLinux, EndeavourOS, Art
 
 ```bash
 # Install httpie
-$ pacman -Sy httpie
+$ pacman -Syu httpie
 ```
 
 ```bash
 # Upgrade httpie
-$ pacman -Syu httpie
+$ pacman -Syu
 ```
 
 ### FreeBSD
@@ -233,36 +250,39 @@ $ pkg upgrade www/py-httpie
 
 ### Unstable version
 
-You can also install the latest unreleased development version directly from the `master` branch on GitHub.
-It is a work-in-progress of a future stable release so the experience might be not as smooth.
+If you want to try out the latest version of HTTPie that hasn't been officially released yet, you can install the development or unstable version directly from the master branch on GitHub. However, keep in mind that the development version is a work in progress and may not be as reliable as the stable version.
 
-You can install it on Linux, macOS, Windows, or FreeBSD with `pip`:
+You can use the following command to install the development version of HTTPie on Linux, macOS, Windows, or FreeBSD operating systems. With this command, the code present in the `master` branch is downloaded and installed using `pip`.
 
 ```bash
-$ python -m pip install --upgrade https://github.com/httpie/httpie/archive/master.tar.gz
+$ python -m pip install --upgrade https://github.com/httpie/cli/archive/master.tar.gz
 ```
 
-Or on macOS, and Linux, with Homebrew:
+There are other ways to install the development version of HTTPie on macOS and Linux.
+
+You can install it using Homebrew by running the following commands:
 
 ```bash
 $ brew uninstall --force httpie
 $ brew install --HEAD httpie
 ```
 
-And even on macOS, and Linux, with Snapcraft:
+You can install it using Snapcraft by running the following commands:
 
 ```bash
 $ snap remove httpie
 $ snap install httpie --edge
 ```
 
-Verify that now you have the [current development version identifier](https://github.com/httpie/httpie/blob/master/httpie/__init__.py#L6) with the `.dev0` suffix, for example:
+To verify the installation, you can compare the [version identifier on GitHub](https://github.com/httpie/cli/blob/master/httpie/__init__.py#L6) with the one available on your machine. You can check the version of HTTPie on your machine by using the command `http --version`.
 
 ```bash
 $ http --version
-# 3.0.0
+# 3.X.X.dev0
 ```
 
+Note that on your machine, the version name will have the `.dev0` suffix.
+
 ## Usage
 
 Hello World:
@@ -277,7 +297,7 @@ Synopsis:
 $ http [flags] [METHOD] URL [ITEM [ITEM]]
 ```
 
-See also `http --help`.
+See also `http --help` (and for systems where man pages are available, you can use `man http`).
 
 ### Examples
 
@@ -305,10 +325,10 @@ Build and print a request without sending it using [offline mode](#offline-mode)
 $ http --offline pie.dev/post hello=offline
 ```
 
-Use [GitHub API](https://developer.github.com/v3/issues/comments/#create-a-comment) to post a comment on an [issue](https://github.com/httpie/httpie/issues/83) with [authentication](#authentication):
+Use [GitHub API](https://developer.github.com/v3/issues/comments/#create-a-comment) to post a comment on an [issue](https://github.com/httpie/cli/issues/83) with [authentication](#authentication):
 
 ```bash
-$ http -a USERNAME POST https://api.github.com/repos/httpie/httpie/issues/83/comments body='HTTPie is awesome! :heart:'
+$ http -a USERNAME POST https://api.github.com/repos/httpie/cli/issues/83/comments body='HTTPie is awesome! :heart:'
 ```
 
 Upload a file using [redirected input](#redirected-input):
@@ -448,7 +468,7 @@ $ http https://api.github.com/search/repositories q==httpie per_page==1
 GET /search/repositories?q=httpie&per_page=1 HTTP/1.1
 ```
 
-You can even retrieve the `value` from a file by using the `param==@file` syntax. This would also effectively strip the newlines from the end. See [#file-based-separators] for more examples.
+You can even retrieve the `value` from a file by using the `param==@file` syntax. This would also effectively strip the newlines from the end. See [file based separators](#file-based-separators) for more examples.
 
 ```bash
 $ http pie.dev/get text==@files/text.txt
@@ -457,7 +477,7 @@ $ http pie.dev/get text==@files/text.txt
 ### URL shortcuts for `localhost`
 
 Additionally, curl-like shorthand for localhost is supported.
-This means that, for example, `:3000` would expand to `http://localhost:3000`
+This means that, for example, `:3000` would expand to `http://localhost:3000`.
 If the port is omitted, then port 80 is assumed.
 
 ```bash
@@ -510,7 +530,7 @@ $ http-unix %2Fvar%2Frun%2Fdocker.sock/info
 
 ### `--path-as-is`
 
-The standard behavior of HTTP clients is to normalize the path portion of URLs by squashing dot segments as a typically filesystem would:
+The standard behavior of HTTP clients is to normalize the path portion of URLs by squashing dot segments as a typical filesystem would:
 
 ```bash
 $ http -v example.org/./../../etc/password
@@ -554,7 +574,7 @@ $ http PUT pie.dev/put \
 |                                    HTTP Headers `Name:Value` | Arbitrary HTTP header, e.g. `X-API-Token:123`                                                                                                                                                                          |
 |                                 URL parameters `name==value` | Appends the given name/value pair as a querystring parameter to the URL. The `==` separator is used.                                                                                                                   |
 |                                    Data Fields `field=value` | Request data fields to be serialized as a JSON object (default), to be form-encoded (with `--form, -f`), or to be serialized as `multipart/form-data` (with `--multipart`)                                             |
-|                                Raw JSON fields `field:=json` | Useful when sending JSON and one or more fields need to be a `Boolean`, `Number`, nested `Object`, or an `Array`, e.g., `meals:='["ham","spam"]'` or `pies:=[1,2,3]` (note the quotes)                                 |
+|                                Raw JSON fields `field:=json` | Useful when sending JSON and one or more fields need to be a `Boolean`, `Number`, nested `Object`, or an `Array`, e.g., `meals:='["ham","spam"]'` or `pies:='[1,2,3]'` (note the quotes)                                 |
 | File upload fields `field@/dir/file`, `field@file;type=mime` | Only available with `--form`, `-f` and `--multipart`. For example `screenshot@~/Pictures/img.png`, or `'cv@cv.txt;type=text/markdown'`. With `--form`, the presence of a file field results in a `--multipart` request |
 
 Note that the structured data fields aren’t the only way to specify request data:
@@ -563,7 +583,7 @@ Note that the structured data fields aren’t the only way to specify request da
 ### File based separators
 
 Using file contents as values for specific fields is a very common use case, which can be achieved through adding the `@` suffix to
-the operators above. For example instead of using a static string as the value for some header, you can use `:@` operator
+the operators above. For example, instead of using a static string as the value for some header, you can use `:@` operator
 to pass the desired value from a file.
 
 ```bash
@@ -729,7 +749,7 @@ $ http --offline --print=B pie.dev/post \
 
 In the example above, the `search[type]` is an instruction for creating an object called `search`, and setting the `type` field of it to the given value (`"id"`).
 
-Also note that, just as the regular syntax, you can use the `:=` operator to directly pass raw JSON values (e.g, numbers in the case above).
+Also note that, just as the regular syntax, you can use the `:=` operator to directly pass raw JSON values (e.g., numbers in the case above).
 
 ```json
 {
@@ -854,6 +874,49 @@ $ http PUT pie.dev/put \
 
 #### Advanced usage
 
+##### Top level arrays
+
+If you want to send an array instead of a regular object, you can simply
+do that by omitting the starting key:
+
+```bash
+$ http --offline --print=B pie.dev/post \
+    []:=1 \
+    []:=2 \
+    []:=3
+```
+
+```json
+[
+    1,
+    2,
+    3
+]
+```
+
+You can also apply the nesting to the items by referencing their index:
+
+```bash
+http --offline --print=B pie.dev/post \
+    [0][type]=platform [0][name]=terminal \
+    [1][type]=platform [1][name]=desktop
+```
+
+```json
+[
+    {
+        "type": "platform",
+        "name": "terminal"
+    },
+    {
+        "type": "platform",
+        "name": "desktop"
+    }
+]
+```
+
+Sending scalar JSON types (a single `null`, `true`, `false`,  string or number) as the top-level object is impossible using the key/value syntax. But you can still pass it via [`--raw='<value>'`](#raw-request-body).
+
 ##### Escaping behavior
 
 Nested JSON syntax uses the same [escaping rules](#escaping-rules) as
@@ -981,7 +1044,7 @@ $ http POST pie.dev/post < files/data.json
 ## Forms
 
 Submitting forms is very similar to sending [JSON](#json) requests.
-Often the only difference is in adding the `--form, -f` option, which ensures that data fields are serialized as, and `Content-Type` is set to `application/x-www-form-urlencoded; charset=utf-8`.
+Often the only difference is in adding the `--form, -f` option, which ensures that data fields are serialized as key-value tuples separated by '&', with a '=' between the key and the value. In addition `Content-Type` is set to `application/x-www-form-urlencoded; charset=utf-8`.
 It is possible to make form data the implicit content type instead of JSON via the [config](#config) file.
 
 ### Regular forms
@@ -1113,11 +1176,11 @@ User-Agent: HTTPie/<version>
 Host: <taken-from-URL>
 ```
 
-Any of these can be overwritten and some of them unset (see below).
+All of these can be overwritten or unset (see below).
 
 ### Reading headers from a file
 
-You can read headers from a file by using the `:@` operator. This would also effectively strip the newlines from the end. See [#file-based-separators] for more examples.
+You can read headers from a file by using the `:@` operator. This would also effectively strip the newlines from the end. See [file based separators](#file-based-separators) for more examples.
 
 ```bash
 $ http pie.dev/headers X-Data:@files/text.txt
@@ -1172,7 +1235,7 @@ by individual commands when sending a request instead of being joined together.
 
 ### Limiting response headers
 
-The `--max-headers=n` options allows you to control the number of headers HTTPie reads before giving up (the default `0`, i.e., there’s no limit).
+The `--max-headers=n` option allows you to control the number of headers HTTPie reads before giving up (the default `0`, i.e., there’s no limit).
 
 ```bash
 $ http --max-headers=100 pie.dev/get
@@ -1336,7 +1399,7 @@ Here are a few picks:
 - [httpie-jwt-auth](https://github.com/teracyhq/httpie-jwt-auth): JWTAuth (JSON Web Tokens)
 - [httpie-negotiate](https://github.com/ndzou/httpie-negotiate): SPNEGO (GSS Negotiate)
 - [httpie-ntlm](https://github.com/httpie/httpie-ntlm): NTLM (NT LAN Manager)
-- [httpie-oauth](https://github.com/httpie/httpie-oauth): OAuth
+- [httpie-oauth1](https://github.com/qcif/httpie-oauth1): OAuth 1.0a
 - [requests-hawk](https://github.com/mozilla-services/requests-hawk): Hawk
 
 See [plugin manager](#plugin-manager) for more details.
@@ -1395,7 +1458,8 @@ $ http --proxy=http:http://user:pass@10.10.1.10:3128 example.org
 
 ### Environment variables
 
-You can also configure proxies by environment variables `ALL_PROXY`, `HTTP_PROXY` and `HTTPS_PROXY`, and the underlying [Requests library](https://python-requests.org/) will pick them up.
+You can also configure proxies by environment variables `ALL_PROXY`, `HTTP_PROXY` and `HTTPS_PROXY`, and the underlying
+[Requests library](https://requests.readthedocs.io/en/latest/) will pick them up.
 If you want to disable proxies configured through the environment variables for certain hosts, you can specify them in `NO_PROXY`.
 
 In your `~/.bash_profile`:
@@ -1448,6 +1512,21 @@ path of the key file with `--cert-key`:
 $ http --cert=client.crt --cert-key=client.key https://example.org
 ```
 
+If the given private key requires a passphrase, HTTPie will automatically detect it
+and ask it through a prompt:
+
+```bash
+$ http --cert=client.pem --cert-key=client.key https://example.org
+http: passphrase for client.key: ****
+```
+
+If you don't want to see a prompt, you can supply the passphrase with the `--cert-key-pass`
+argument:
+
+```bash
+$ http --cert=client.pem --cert-key=client.key --cert-key-pass=my_password https://example.org
+```
+
 ### SSL version
 
 Use the `--ssl=<PROTOCOL>` option to specify the desired protocol version to use.
@@ -1597,6 +1676,10 @@ If you’d like to silence warnings as well, use `-q` or `--quiet` twice:
 $ http -qq --check-status pie.dev/post enjoy='the silence without warnings'
 ```
 
+### Update warnings
+
+When there is a new release available for your platform (for example; if you installed HTTPie through `pip`, it will check the latest version on `PyPI`), HTTPie will regularly warn you about the new update (once a week). If you want to disable this behavior, you can set `disable_update_warnings` to `true` in your [config](#config) file.
+
 ### Viewing intermediary requests/responses
 
 To see all the HTTP communication, i.e. the final request/response as well as any possible intermediary requests/responses, use the `--all` option.
@@ -1609,14 +1692,6 @@ $ http --all --follow pie.dev/redirect/3
 
 The intermediary requests/responses are by default formatted according to `--print, -p` (and its shortcuts described above).
 
-If you’d like to change that, use the `--history-print, -P` option.
-It takes the same arguments as `--print, -p` but applies to the intermediary requests only.
-
-```bash
-# Print the intermediary requests/responses differently than the final one:
-$ http -A digest -a foo:bar --all -p Hh -P H pie.dev/digest-auth/auth/foo/bar
-```
-
 ### Conditional body download
 
 As an optimization, the response body is downloaded from the server only if it’s part of the output.
@@ -1679,7 +1754,7 @@ $ http pie.dev/post <<<'{"name": "John"}'
 You can even pipe web services together using HTTPie:
 
 ```bash
-$ http GET https://api.github.com/repos/httpie/httpie | http POST pie.dev/post
+$ http GET https://api.github.com/repos/httpie/cli | http POST pie.dev/post
 ```
 
 You can use `cat` to enter multiline data on the terminal:
@@ -1927,7 +2002,7 @@ HTTPie features a download mode in which it acts similarly to `wget`.
 When enabled using the `--download, -d` flag, response headers are printed to the terminal (`stderr`), and a progress bar is shown while the response body is being saved to a file.
 
 ```bash
-$ http --download https://github.com/httpie/httpie/archive/master.tar.gz
+$ http --download https://github.com/httpie/cli/archive/master.tar.gz
 ```
 
 ```http
@@ -1956,7 +2031,7 @@ To prevent data loss by overwriting, HTTPie adds a unique numerical suffix to th
 You can also redirect the response body to another program while the response headers and progress are still shown in the terminal:
 
 ```bash
-$ http -d https://github.com/httpie/httpie/archive/master.tar.gz | tar zxf -
+$ http -d https://github.com/httpie/cli/archive/master.tar.gz | tar zxf -
 ```
 
 ### Resuming downloads
@@ -2101,38 +2176,88 @@ $ http --session-read-only=./ro-session.json pie.dev/headers Custom-Header:orig-
 $ http --session-read-only=./ro-session.json pie.dev/headers Custom-Header:new-value
 ```
 
-### Cookie Storage Behavior
+### Host-based cookie policy
+
+Cookies persisted in sessions files have a `domain` field. This _binds_ them to a specified hostname. For example:
+
+```json
+{
+    "cookies": [
+        {
+            "domain": "pie.dev",
+            "name": "pie",
+            "value": "apple"
+        },
+        {
+            "domain": "httpbin.org",
+            "name": "bin",
+            "value": "http"
+        }
+    ]
+}
+```
+
+Using this session file, we include `Cookie: pie=apple` only in requests against `pie.dev` and subdomains (e.g., `foo.pie.dev` or `foo.bar.pie.dev`):
+
+```bash
+$ http --session=./session.json pie.dev/cookies
+```
+
+```json
+{
+    "cookies": {
+        "pie": "apple"
+    }
+}
+```
+
+To make a cookie domain _unbound_ (i.e., to make it available to all hosts, including throughout a cross-domain redirect chain), you can set the `domain` field to `null` in the session file:
+
+```json
+{
+    "cookies": [
+        {
+            "domain": null,
+            "name": "unbound-cookie",
+            "value": "send-me-to-any-host"
+        }
+    ]
+}
+```
+
+```bash
+$ http --session=./session.json pie.dev/cookies
+```
+
+```json
+{
+    "cookies": {
+        "unbound-cookie": "send-me-to-any-host"
+    }
+}
+```
+
 
-**TL;DR:** Cookie storage priority: Server response > Command line request > Session file
+### Cookie storage behavior
 
-To set a cookie within a Session there are three options:
+There are three possible sources of persisted cookies within a session. They have the following storage priority: 1—response; 2—command line; 3—session file.
 
-1. Get a `Set-Cookie` header in a response from a server
+1. Receive a response with a `Set-Cookie` header:
 
-   ```bash
-   $ http --session=./session.json pie.dev/cookie/set?foo=bar
-   ```
+    ```bash
+    $ http --session=./session.json pie.dev/cookie/set?foo=bar
+    ```
 
-2. Set the cookie name and value through the command line as seen in [cookies](#cookies)
+2. Send a cookie specified on the command line as seen in [cookies](#cookies):
 
-   ```bash
-   $ http --session=./session.json pie.dev/headers Cookie:foo=bar
-   ```
+    ```bash
+    $ http --session=./session.json pie.dev/headers Cookie:foo=bar
+    ```
 
-3. Manually set cookie parameters in the JSON file of the session
+3. Manually set cookie parameters in the session file:
 
-   ```json
-   {
-       "__meta__": {
-       "about": "HTTPie session file",
-       "help": "https://httpie.org/doc#sessions",
-       "httpie": "2.2.0-dev"
-       },
-       "auth": {
-           "password": null,
-           "type": null,
-           "username": null
-       },
+    ```json
+    {
        "cookies": {
            "foo": {
                "expires": null,
@@ -2141,16 +2266,55 @@ To set a cookie within a Session there are three options:
                "value": "bar"
                }
        }
-   }
-   ```
+    }
+    ```
+
+In summary:
+
+- Cookies set via the CLI overwrite cookies of the same name inside session files.
+- Server-sent `Set-Cookie` header cookies overwrite any pre-existing ones with the same name.
+
+Cookie expiration handling:
+
+- When the server expires an existing cookie, HTTPie removes it from the session file.
+- When a cookie in a session file expires, HTTPie removes it before sending a new request.
+
+### Upgrading sessions
+
+HTTPie may introduce changes in the session file format.  When HTTPie detects an obsolete format, it shows a warning. You can upgrade your session files using the following commands:
+
+Upgrade all existing [named sessions](#named-sessions) inside the `sessions` subfolder of your [config directory](https://httpie.io/docs/cli/config-file-directory):
+
+```bash
+$ httpie cli sessions upgrade-all
+Upgraded 'api_auth' @ 'pie.dev' to v3.1.0
+Upgraded 'login_cookies' @ 'httpie.io' to v3.1.0
+```
+
+Upgrading individual sessions requires you to specify the session's hostname. That allows HTTPie to find the correct file in the case of name sessions. Additionally, it allows it to correctly bind cookies when upgrading with [`--bind-cookies`](#session-upgrade-options).
+
+Upgrade a single [named session](#named-sessions):
+
+```bash
+$ httpie cli sessions upgrade pie.dev api_auth
+Upgraded 'api_auth' @ 'pie.dev' to v3.1.0
+```
+
+Upgrade a single [anonymous session](#anonymous-sessions) using a file path:
+
+```bash
+$ httpie cli sessions upgrade pie.dev ./session.json
+Upgraded 'session.json' @ 'pie.dev' to v3.1.0
+```
+
+#### Session upgrade options
 
-Cookies will be set in the session file with the priority specified above.
-For example, a cookie set through the command line will overwrite a cookie of the same name stored in the session file.
-If the server returns a `Set-Cookie` header with a cookie of the same name, the returned cookie will overwrite the preexisting cookie.
+These flags are available for both `sessions upgrade` and `sessions upgrade-all`:
+
+| Option           | Description                                                                                                                                                                   |
+|------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `--bind-cookies` | Bind all previously [unbound cookies](#host-based-cookie-policy) to the session’s host ([context](https://github.com/httpie/cli/security/advisories/GHSA-9w4w-cpc8-h2fq)). |
 
-Expired cookies are never stored.
-If a cookie in a session file expires, it will be removed before sending a new request.
-If the server expires an existing cookie, it will also be removed from the session file.
 
 ## Config
 
@@ -2163,7 +2327,7 @@ To see the exact location for your installation, run `http --debug` and look for
 
 The default location of the configuration file on most platforms is `$XDG_CONFIG_HOME/httpie/config.json` (defaulting to `~/.config/httpie/config.json`).
 
-For backwards compatibility, if the directory `~/.httpie` exists, the configuration file there will be used instead.
+For backward compatibility, if the directory `~/.httpie` exists, the configuration file there will be used instead.
 
 On Windows, the config file is located at `%APPDATA%\httpie\config.json`.
 
@@ -2202,7 +2366,7 @@ However, it is not recommended modifying the default behavior in a way that woul
 #### `plugins_dir`
 
 The directory where the plugins will be installed. HTTPie needs to have read/write access on that directory, since
-`httpie plugins install` will download new plugins to there. See [plugin manager](#plugin-manager) for more information.
+`httpie cli plugins install` will download new plugins to there. See [plugin manager](#plugin-manager) for more information.
 
 ### Un-setting previously specified options
 
@@ -2236,16 +2400,13 @@ fi
 The default behavior of automatically reading `stdin` is typically not desirable during non-interactive invocations.
 You most likely want to use the `--ignore-stdin` option to disable it.
 
-It is a common *gotcha* that without this option HTTPie seemingly hangs.
-What happens is that when HTTPie is invoked, for example, from a cron job, `stdin` is not connected to a terminal.
-Therefore, the rules for [redirected input](#redirected-input) apply, i.e. HTTPie starts to read it expecting that the request body will be passed through.
-And since there’s neither data nor `EOF`, it will get stuck. So unless you’re piping some data to HTTPie, the `--ignore-stdin` flag should be used in scripts.
+It's important to note that without the `--ignore-stdin` option, HTTPie may appear to have stopped working (hang). This happens because, in situations where HTTPie is invoked outside of an interactive session, such as from a cron job, `stdin` is not connected to a terminal. This means that the rules for [redirected input](#redirected-input) will be followed. When `stdin` is redirected, HTTPie assumes that the input will contain the request body, and it waits for the input to be provided. But, since there is neither any input data nor an end-of-file (`EOF`) signal, HTTPie gets stuck. To avoid this problem, the `--ignore-stdin` flag should be used in scripts, unless data is being piped to HTTPie.
 
-Also, it might be good to set a connection `--timeout` limit to prevent your program from hanging if the server never responds.
+To prevent your program from becoming unresponsive when the server fails to respond, it's a good idea to use the `--timeout` option to set a connection timeout limit.
 
 ## Plugin manager
 
-HTTPie offers extensibility through a [plugin API](https://github.com/httpie/httpie/blob/master/httpie/plugins/base.py),
+HTTPie offers extensibility through a [plugin API](https://github.com/httpie/cli/blob/master/httpie/plugins/base.py),
 and there are dozens of plugins available to try!
 They add things like new authentication methods ([akamai/httpie-edgegrid](https://github.com/akamai/httpie-edgegrid)),
 transport mechanisms ([httpie/httpie-unixsocket](https://github.com/httpie/httpie-unixsocket)),
@@ -2259,7 +2420,36 @@ For managing these plugins; starting with 3.0, we are offering a new plugin mana
 
 This command is currently in beta.
 
-### `httpie plugins`
+### `httpie cli`
+
+#### `httpie cli check-updates`
+
+You can check whether a new update is available for your system by running `httpie cli check-updates`:
+
+```bash-termible
+$ httpie cli check-updates
+```
+
+#### `httpie cli export-args`
+
+`httpie cli export-args` command can expose the parser specification of `http`/`https` commands
+(like an API definition) to outside tools so that they can use this to build better interactions
+over them (e.g., offer auto-complete).
+
+Available formats to export in include:
+
+| Format | Description                                                                                                                                       |
+|--------|---------------------------------------------------------------------------------------------------------------------------------------------------|
+| `json` | Export the parser spec in JSON. The schema includes a top-level `version` parameter which should be interpreted in [semver](https://semver.org/). |
+
+You can use any of these formats with `--format` parameter, but the default one is `json`.
+
+```bash
+$ httpie cli export-args | jq '"Program: " + .spec.name + ", Version: " +  .version'
+"Program: http, Version: 0.0.1a0"
+```
+
+#### `httpie cli plugins`
 
 `plugins` interface is a very simple plugin manager for installing, listing and uninstalling HTTPie plugins.
 
@@ -2270,13 +2460,13 @@ plugin installations on every installation method.
 By default, the plugins (and their missing dependencies) will be stored under the configuration directory,
 but this can be modified through `plugins_dir` variable on the config.
 
-#### `httpie plugins install`
+##### `httpie cli plugins install`
 
-For installing plugins from [PyPI](https://pypi.org/) or from local paths, `httpie plugins install`
+For installing plugins from [PyPI](https://pypi.org/) or from local paths, `httpie cli plugins install`
 can be used.
 
 ```bash
-$ httpie plugins install httpie-plugin
+$ httpie cli plugins install httpie-plugin
 Installing httpie-plugin...
 Successfully installed httpie-plugin-1.0.2
 ```
@@ -2284,12 +2474,12 @@ Successfully installed httpie-plugin-1.0.2
 > Tip: Generally HTTPie plugins start with `httpie-` prefix. Try searching for it on [PyPI](https://pypi.org/search/?q=httpie-)
 > to find out all plugins from the community.
 
-#### `httpie plugins list`
+##### `httpie cli plugins list`
 
 List all installed plugins.
 
 ```bash
-$ httpie plugins list
+$ httpie cli plugins list
 httpie_plugin (1.0.2)
   httpie_plugin (httpie.plugins.auth.v1)
 httpie_plugin_2 (1.0.6)
@@ -2299,21 +2489,21 @@ httpie_converter (1.0.0)
   httpie_konsole_konverter (httpie.plugins.converter.v1)
 ```
 
-#### `httpie plugins upgrade`
+##### `httpie cli plugins upgrade`
 
 For upgrading already installed plugins, use `httpie plugins upgrade`.
 
 ```bash
-$ httpie plugins upgrade httpie-plugin
+$ httpie cli plugins upgrade httpie-plugin
 ```
 
-#### `httpie plugins uninstall`
+##### `httpie cli plugins uninstall`
 
 Uninstall plugins from the isolated plugins directory. If the plugin is not installed
-through `httpie plugins install`, it won’t uninstall it.
+through `httpie cli plugins install`, it won’t uninstall it.
 
 ```bash
-$ httpie plugins uninstall httpie-plugin
+$ httpie cli plugins uninstall httpie-plugin
 ```
 
 ## Meta
@@ -2356,7 +2546,7 @@ All changes are recorded in the [change log](#change-log).
 
 HTTPie has the following community channels:
 
-- [GitHub Issues](https://github.com/httpie/httpie/issues) for bug reports and feature requests
+- [GitHub Issues](https://github.com/httpie/cli/issues) for bug reports and feature requests
 - [Discord server](https://httpie.io/discord) to ask questions, discuss features, and for general API development discussion
 - [StackOverflow](https://stackoverflow.com) to ask questions (make sure to use the [httpie](https://stackoverflow.com/questions/tagged/httpie) tag)
 
@@ -2366,7 +2556,7 @@ HTTPie has the following community channels:
 
 Under the hood, HTTPie uses these two amazing libraries:
 
-- [Requests](https://python-requests.org) — Python HTTP library for humans
+- [Requests](https://requests.readthedocs.io/en/latest/) — Python HTTP library for humans
 - [Pygments](https://pygments.org/) — Python syntax highlighter
 
 #### HTTPie friends
@@ -2378,7 +2568,7 @@ HTTPie plays exceptionally well with the following tools:
 
 Helpers to convert from other client tools:
 
-- [CurliPie](https://curlipie.now.sh/) help convert cURL command line to HTTPie command line
+- [CurliPie](https://curlipie.open-api.vn) — library to convert cURL commands to HTTPie
 
 #### Alternatives
 
@@ -2387,20 +2577,25 @@ Helpers to convert from other client tools:
 
 ### Contributing
 
-See [CONTRIBUTING](https://github.com/httpie/httpie/blob/master/CONTRIBUTING.md).
+See [CONTRIBUTING](https://github.com/httpie/cli/blob/master/CONTRIBUTING.md).
+
+### Security policy
+
+See [github.com/httpie/cli/security/policy](https://github.com/httpie/cli/security/policy).
 
 ### Change log
 
-See [CHANGELOG](https://github.com/httpie/httpie/blob/master/CHANGELOG.md).
+See [CHANGELOG](https://github.com/httpie/cli/blob/master/CHANGELOG.md).
 
 ### Artwork
 
-- [README Animation](https://github.com/httpie/httpie/blob/master/docs/httpie-animation.gif) by [Allen Smith](https://github.com/loranallensmith).
+- [README Animation](https://github.com/httpie/cli/blob/master/docs/httpie-animation.gif) by [Allen Smith](https://github.com/loranallensmith).
 
 ### Licence
 
-BSD-3-Clause: [LICENSE](https://github.com/httpie/httpie/blob/master/LICENSE).
+BSD-3-Clause: [LICENSE](https://github.com/httpie/cli/blob/master/LICENSE).
 
 ### Authors
 
-[Jakub Roztocil](https://roztocil.co) ([@jakubroztocil](https://twitter.com/jakubroztocil)) created HTTPie and [these fine people](https://github.com/httpie/httpie/blob/master/AUTHORS.md) have contributed.
+[Jakub Roztocil](https://roztocil.co) ([@jakubroztocil](https://twitter.com/jakubroztocil)) created HTTPie and [these fine people](https://github.com/httpie/cli/blob/master/AUTHORS.md) have contributed.
+
diff --git a/docs/contributors/README.md b/docs/contributors/README.md
index 20b3c278fb..9a739cd543 100644
--- a/docs/contributors/README.md
+++ b/docs/contributors/README.md
@@ -1,3 +1,3 @@
-Here we maintain a database of contributors, from which we generate credits on release blog posts and social medias.
+Here we maintain a database of contributors, from which we generate credits on release blog posts and social media.
 
 For the HTTPie blog see: <https://httpie.io/blog>.
diff --git a/docs/contributors/fetch.py b/docs/contributors/fetch.py
index 7924f46443..ba94c28183 100644
--- a/docs/contributors/fetch.py
+++ b/docs/contributors/fetch.py
@@ -252,6 +252,7 @@ def fetch_missing_users_details(people: People) -> None:
 def save_awesome_people(people: People) -> None:
     with DB_FILE.open(mode='w', encoding='utf-8') as fh:
         json.dump(people, fh, indent=4, sort_keys=True)
+        fh.write("\n")
 
 
 def debug(*args: Any) -> None:
diff --git a/docs/contributors/generate.py b/docs/contributors/generate.py
index d3d6fdd95c..27470d5672 100644
--- a/docs/contributors/generate.py
+++ b/docs/contributors/generate.py
@@ -8,19 +8,27 @@
 from fetch import HERE, load_awesome_people
 
 TPL_FILE = HERE / 'snippet.jinja2'
+
 HTTPIE_TEAM = {
     'claudiatd',
     'jakubroztocil',
     'jkbr',
+    'isidentical'
+}
+
+BOT_ACCOUNTS = {
+    'dependabot-sr'
 }
 
+IGNORE_ACCOUNTS = HTTPIE_TEAM | BOT_ACCOUNTS
+
 
 def generate_snippets(release: str) -> str:
     people = load_awesome_people()
     contributors = {
         name: details
         for name, details in people.items()
-        if details['github'] not in HTTPIE_TEAM
+        if details['github'] not in IGNORE_ACCOUNTS
         and (release in details['committed'] or release in details['reported'])
     }
 
diff --git a/docs/contributors/people.json b/docs/contributors/people.json
index 041e67f2f7..70514fcc2d 100644
--- a/docs/contributors/people.json
+++ b/docs/contributors/people.json
@@ -53,11 +53,13 @@
     },
     "Batuhan Taskaya": {
         "committed": [
-            "3.0.0"
+            "3.0.0",
+            "3.2.0"
         ],
         "github": "isidentical",
         "reported": [
-            "3.0.0"
+            "3.0.0",
+            "3.2.0"
         ],
         "twitter": "isidentical"
     },
@@ -118,6 +120,14 @@
         "reported": [],
         "twitter": "elena_lape"
     },
+    "Ethan Mills": {
+        "committed": [
+            "3.2.0"
+        ],
+        "github": "ethanmills",
+        "reported": [],
+        "twitter": null
+    },
     "Fabio Peruzzo": {
         "committed": [],
         "github": "peruzzof",
@@ -189,7 +199,8 @@
         "committed": [
             "2.5.0",
             "2.6.0",
-            "3.0.0"
+            "3.0.0",
+            "3.2.0"
         ],
         "github": "jakubroztocil",
         "reported": [
@@ -213,7 +224,8 @@
         ],
         "github": "blyxxyz",
         "reported": [
-            "3.0.0"
+            "3.0.0",
+            "3.2.0"
         ],
         "twitter": null
     },
@@ -309,7 +321,8 @@
         "committed": [],
         "github": "ducaale",
         "reported": [
-            "2.5.0"
+            "2.5.0",
+            "3.2.0"
         ],
         "twitter": null
     },
@@ -321,6 +334,22 @@
         ],
         "twitter": "sevenc_nanashi"
     },
+    "Nicklas Ansman Giertz": {
+        "committed": [],
+        "github": "ansman",
+        "reported": [
+            "3.2.0"
+        ],
+        "twitter": null
+    },
+    "Oliver Fish": {
+        "committed": [],
+        "github": "Oliver-Fish",
+        "reported": [
+            "3.2.0"
+        ],
+        "twitter": null
+    },
     "Omer Akram": {
         "committed": [
             "2.6.0",
@@ -357,6 +386,14 @@
         ],
         "twitter": null
     },
+    "Roberto L\u00f3pez L\u00f3pez": {
+        "committed": [],
+        "github": "robertolopezlopez",
+        "reported": [
+            "3.2.0"
+        ],
+        "twitter": null
+    },
     "Russell Shurts": {
         "committed": [],
         "github": "rshurts",
@@ -487,6 +524,14 @@
         ],
         "twitter": null
     },
+    "dependabot[bot]": {
+        "committed": [
+            "3.2.0"
+        ],
+        "github": "dependabot-sr",
+        "reported": [],
+        "twitter": null
+    },
     "dkreeft": {
         "committed": [
             "2.6.0",
@@ -553,6 +598,14 @@
         ],
         "twitter": null
     },
+    "luzpaz": {
+        "committed": [
+            "3.2.0"
+        ],
+        "github": "luzpaz",
+        "reported": [],
+        "twitter": null
+    },
     "nixbytes": {
         "committed": [
             "2.5.0"
@@ -593,6 +646,14 @@
         ],
         "twitter": null
     },
+    "zhaohanqing95": {
+        "committed": [],
+        "github": "zhaohanqing95",
+        "reported": [
+            "3.2.0"
+        ],
+        "twitter": null
+    },
     "zoulja": {
         "committed": [],
         "github": "zoulja",
@@ -627,4 +688,4 @@
         ],
         "twitter": null
     }
-}
\ No newline at end of file
+}
diff --git a/docs/contributors/snippet.jinja2 b/docs/contributors/snippet.jinja2
index 4fa21b12ef..56e7d33fc1 100644
--- a/docs/contributors/snippet.jinja2
+++ b/docs/contributors/snippet.jinja2
@@ -2,9 +2,10 @@
 
 ## Community contributions
 
-We’d like to thank these amazing people for their contributions to this release: {% for name, details in contributors.items() -%}
-    [{{ name }}](https://github.com/{{ details.github }}){{ '' if loop.last else ', ' }}
-{%- endfor %}.
+We’d like to thank these amazing people for their contributions to this release:
+{% for name, details in contributors.items() -%}
+- [{{ name }}](https://github.com/{{ details.github }}){{ '' if loop.last else '\n' }}
+{%- endfor %}
 
 <!-- Twitter -->
 
diff --git a/docs/installation/generate.py b/docs/installation/generate.py
index a67389ddd5..0597a3a429 100644
--- a/docs/installation/generate.py
+++ b/docs/installation/generate.py
@@ -55,7 +55,7 @@ def build_docs_structure(database: Database):
     tree = database[KEY_DOC_STRUCTURE]
     structure = []
     for platform, tools_ids in tree.items():
-        assert platform.isalnum(), f'{platform=} must be alpha-numeric for generated links to work'
+        assert platform.isalnum(), f'{platform=} must be alphanumeric for generated links to work'
         platform_tools = [tools[tool_id] for tool_id in tools_ids]
         structure.append((platform, platform_tools))
     return structure
diff --git a/docs/installation/methods.yml b/docs/installation/methods.yml
index 1583b2364a..290b0e2436 100644
--- a/docs/installation/methods.yml
+++ b/docs/installation/methods.yml
@@ -17,11 +17,12 @@ docs-structure:
   Windows:
     - chocolatey
   Linux:
-    - snap-linux
-    - brew-linux
     - apt
     - dnf
     - yum
+    - single-binary
+    - snap-linux
+    - brew-linux
     - pacman
   FreeBSD:
     - pkg
@@ -36,11 +37,13 @@ tools:
       package: https://packages.debian.org/sid/web/httpie
     commands:
       install:
-        - apt update
-        - apt install httpie
+        - curl -SsL https://packages.httpie.io/deb/KEY.gpg | sudo gpg --dearmor -o /usr/share/keyrings/httpie.gpg
+      # - curl -SsL -o /etc/apt/sources.list.d/httpie.list https://packages.httpie.io/deb/httpie.list
+        - echo "deb [arch=amd64 signed-by=/usr/share/keyrings/httpie.gpg] https://packages.httpie.io/deb ./" | sudo tee /etc/apt/sources.list.d/httpie.list > /dev/null
+        - sudo apt update
+        - sudo apt install httpie
       upgrade:
-        - apt update
-        - apt upgrade httpie
+        - sudo apt update && sudo apt upgrade httpie
 
   brew-mac:
     title: Homebrew
@@ -106,9 +109,9 @@ tools:
       package: https://archlinux.org/packages/community/any/httpie/
     commands:
       install:
-        - pacman -Sy httpie
-      upgrade:
         - pacman -Syu httpie
+      upgrade:
+        - pacman -Syu
 
   pkg:
     title: FreshPorts
@@ -179,3 +182,16 @@ tools:
         - yum install httpie
       upgrade:
         - yum upgrade httpie
+
+  single-binary:
+    title: Single binary executables
+    name: Single binary executables
+    note: Get the standalone HTTPie Linux executables when you don't want to go through the full installation process.
+    links:
+    commands:
+      install:
+        - https --download packages.httpie.io/binaries/linux/http-latest -o http
+        - ln -ls ./http ./https
+        - chmod +x ./http ./https
+      upgrade:
+        - https --download packages.httpie.io/binaries/linux/http-latest -o http
diff --git a/docs/markdownlint.rb b/docs/markdownlint.rb
index 0bf3f87b2b..cf2878c7b0 100644
--- a/docs/markdownlint.rb
+++ b/docs/markdownlint.rb
@@ -11,6 +11,9 @@
 # Because we use HTML to hide them on the website.
 exclude_rule 'MD002'
 
+# MD007 Allow unordered list indentation
+exclude_rule 'MD007'
+
 # MD013 Line length
 exclude_rule 'MD013'
 
diff --git a/docs/packaging/README.md b/docs/packaging/README.md
index c8d18b2832..e455742cc5 100644
--- a/docs/packaging/README.md
+++ b/docs/packaging/README.md
@@ -3,7 +3,7 @@
 Welcome on the documentation part of the **HTTPie release process**.
 
 - If you do not know HTTPie, have a look [here](https://httpie.io/cli).
-- If you are looking for HTTPie installation or upgrade instructions, then you can find all you need for your OS on [that page](https://httpie.io/docs#installation). In the case you do not find your OS, [let us know](https://github.com/httpie/httpie/issues/).
+- If you are looking for HTTPie installation or upgrade instructions, then you can find all you need for your OS on [that page](https://httpie.io/docs#installation). In the case you do not find your OS, [let us know](https://github.com/httpie/cli/issues/).
 - If you are looking for technical information about the HTTPie packaging, then you are at the good place.
 
 ## About
@@ -12,18 +12,20 @@ You are looking at the HTTPie packaging documentation, where you will find valua
 
 The overall release process starts simple:
 
-1. Do the [PyPI](https://pypi.org/project/httpie/) publication.
-2. Then, handle company-related tasks.
-3. Finally, follow OS-specific steps, described in documents below, to send patches downstream.
+1. Bump the version identifiers in the following places:
+    - `httpie/__init__.py`
+    - `docs/packaging/windows-chocolatey/httpie.nuspec`
+    - `CHANGELOG.md`
+2. Commit your changes and make a PR against the `master`.
+3. Merge the PR, and tag the last commit with your version identifier.
+4. Make a GitHub release (by copying the text in `CHANGELOG.md`)
+5. Push that release to PyPI (dispatch the `Release PyPI` GitHub action).
+6. Once PyPI is ready, push the release to the Snap, Homebrew and Chocolatey with their respective actions.
+7. Go to the [`httpie/debian.httpie.io`](https://github.com/httpie/debian.httpie.io) repo and trigger the package index workflow.
 
-## First, PyPI
+## Company-specific tasks
 
-Let's do the release on [PyPi](https://pypi.org/project/httpie/).
-That is done quite easily by manually triggering the [release workflow](https://github.com/httpie/httpie/actions/workflows/release.yml).
-
-## Then, company-specific tasks
-
-- Blank the `master_and_released_docs_differ_after` value in [config.json](https://github.com/httpie/httpie/blob/master/docs/config.json).
+- Blank the `master_and_released_docs_differ_after` value in [config.json](https://github.com/httpie/cli/blob/master/docs/config.json).
 - Update the [contributors list](../contributors).
 - Update the HTTPie version bundled into [Termible](https://termible.io/) ([example](https://github.com/httpie/termible/pull/1)).
 
@@ -36,11 +38,10 @@ A more complete state of deployment can be found on [repology](https://repology.
 | -------------------------------------------: | -------------- |
 |       [Arch Linux, and derived](linux-arch/) | trusted person |
 |   [CentOS, RHEL, and derived](linux-centos/) | trusted person |
-| [Debian, Ubuntu, and derived](linux-debian/) | trusted person |
 |                      [Fedora](linux-fedora/) | trusted person |
-|  :construction: [Homebrew, Linuxbrew](brew/) | **HTTPie**     |
-|        :construction: [MacPorts](mac-ports/) | **HTTPie**     |
+| [Debian, Ubuntu, and derived](linux-debian/) | **HTTPie**     |
+|                 [Homebrew, Linuxbrew](brew/) | **HTTPie**     |
 |                      [Snapcraft](snapcraft/) | **HTTPie**     |
 |  [Windows — Chocolatey](windows-chocolatey/) | **HTTPie**     |
 
-:new: You do not find your system or you would like to see HTTPie supported on another OS? Then [let us know](https://github.com/httpie/httpie/issues/).
+:new: You do not find your system or you would like to see HTTPie supported on another OS? Then [let us know](https://github.com/httpie/cli/issues/).
diff --git a/docs/packaging/brew/README.md b/docs/packaging/brew/README.md
index 2acb3299fb..a06324ecd3 100644
--- a/docs/packaging/brew/README.md
+++ b/docs/packaging/brew/README.md
@@ -13,21 +13,19 @@ We will discuss setting up the environment, installing development tools, instal
 
 ## Overall process
 
-:construction: Work in progress.
+The brew deployment is completely automated, and only requires a trigger to [`Release on Homebrew`](https://github.com/httpie/cli/actions/workflows/release-brew.yml) action
+from the release manager.
 
-First, update the current Formula:
+If it is needed to be done manually, the following command can be used:
 
-```bash
-make brew-deps
-# Copy-paste content into downstream/mac/brew/httpie.rb
-git add downstream/mac/brew/httpie.rb
-git commit -s -m 'Update brew formula to XXX'
+```console
+$ brew bump-formula-pr httpie --version={TARGET_VERSION}
 ```
 
-That [GitHub workflow](https://github.com/httpie/httpie/actions/workflows/test-package-mac-brew.yml) will test the formula when `downstream/mac/brew/httpie.rb` is changed in a pull request.
-
-Then, open a pull request with those changes to the [downstream file](https://github.com/Homebrew/homebrew-core/blob/master/Formula/httpie.rb).
+which will bump the formula, and create a PR against the package index.
 
 ## Hacking
 
-:construction: Work in progress.
+Make your changes, test the formula through the [`Test Brew Package`](https://github.com/httpie/cli/actions/workflows/test-package-mac-brew.yml) action
+and then finally submit your patch to [`homebrew-core`](https://github.com/Homebrew/homebrew-core`)
+
diff --git a/docs/packaging/brew/brew-deps.py b/docs/packaging/brew/brew-deps.py
deleted file mode 100755
index 3e45683942..0000000000
--- a/docs/packaging/brew/brew-deps.py
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env python3
-"""
-Generate Ruby code with URLs and file hashes for packages from PyPi
-(i.e., httpie itself as well as its dependencies) to be included
-in the Homebrew formula after a new release of HTTPie has been published
-on PyPi.
-
-<https://github.com/Homebrew/homebrew-core/blob/master/Formula/httpie.rb>
-
-"""
-import hashlib
-import requests
-
-
-VERSIONS = {
-    # By default, we use the latest packages. But sometimes Requests has a maximum supported versions.
-    # Take a look here before making a release: <https://github.com/psf/requests/blob/master/setup.py>
-    'idna': '3.2',
-}
-
-
-# Note: Keep that list sorted.
-PACKAGES = [
-    'certifi',
-    'charset-normalizer',
-    'defusedxml',
-    'httpie',
-    'idna',
-    'Pygments',
-    'PySocks',
-    'requests',
-    'requests-toolbelt',
-    'urllib3',
-    'multidict',
-]
-
-
-def get_package_meta(package_name):
-    api_url = f'https://pypi.org/pypi/{package_name}/json'
-    resp = requests.get(api_url).json()
-    hasher = hashlib.sha256()
-    version = VERSIONS.get(package_name)
-    if package_name not in VERSIONS:
-        # Latest version
-        release_bundle = resp['urls']
-    else:
-        release_bundle = resp['releases'][version]
-
-    for release in release_bundle:
-        download_url = release['url']
-        if download_url.endswith('.tar.gz'):
-            hasher.update(requests.get(download_url).content)
-            return {
-                'name': package_name,
-                'url': download_url,
-                'sha256': hasher.hexdigest(),
-            }
-    else:
-        raise RuntimeError(f'{package_name}: download not found: {resp}')
-
-
-def main():
-    package_meta_map = {
-        package_name: get_package_meta(package_name)
-        for package_name in PACKAGES
-    }
-    httpie_meta = package_meta_map.pop('httpie')
-    print()
-    print('  url "{url}"'.format(url=httpie_meta['url']))
-    print('  sha256 "{sha256}"'.format(sha256=httpie_meta['sha256']))
-    print()
-    for dep_meta in package_meta_map.values():
-        print('  resource "{name}" do'.format(name=dep_meta['name']))
-        print('    url "{url}"'.format(url=dep_meta['url']))
-        print('    sha256 "{sha256}"'.format(sha256=dep_meta['sha256']))
-        print('  end')
-        print('')
-
-
-if __name__ == '__main__':
-    main()
diff --git a/docs/packaging/brew/httpie.rb b/docs/packaging/brew/httpie.rb
index ed09cb5309..e249a5aa10 100644
--- a/docs/packaging/brew/httpie.rb
+++ b/docs/packaging/brew/httpie.rb
@@ -3,18 +3,18 @@ class Httpie < Formula
 
   desc "User-friendly cURL replacement (command-line HTTP client)"
   homepage "https://httpie.io/"
-  url "https://files.pythonhosted.org/packages/7b/f9/13070f19226b7db3641fb787df36bb715063abe1b8ca03fbaeca0f465d27/httpie-3.0.1.tar.gz"
-  sha256 "0e9bc93ebdcdd2d32ec24b8fa46cf7e4fde9eec7a6bd0c5d0ef224f25d7466b2"
+  url "https://files.pythonhosted.org/packages/32/85/bb095699be20cc98731261cb80884e9458178f8fef2a38273530ce77c0a5/httpie-3.1.0.tar.gz"
+  sha256 "2e4a2040b84a912e65c01fb34f7aafe88cad2a3af2da8c685ca65080f376feda"
   license "BSD-3-Clause"
-  head "https://github.com/httpie/httpie.git", branch: "master"
+  head "https://github.com/httpie/cli.git", branch: "master"
 
   bottle do
-    sha256 cellar: :any_skip_relocation, arm64_monterey: "9d285fcfb55ce8ed787d1b01966d51e6e07f7e77c44a204695a2d6eee9c8698d"
-    sha256 cellar: :any_skip_relocation, arm64_big_sur:  "743a282b475e87a4eaf11e545f761aef1b8e4bfe49eaee47251d7629a35a8ced"
-    sha256 cellar: :any_skip_relocation, monterey:       "5d63ea4f47b2028b2ba68abe12a4176934193e058edd869270221b41cc946c76"
-    sha256 cellar: :any_skip_relocation, big_sur:        "5a53221a680a35d1aa00cbadde279dbe4f562d22ed207c15bd4221cb8c3180f1"
-    sha256 cellar: :any_skip_relocation, catalina:       "5feadb6d76f55d6f9681682e221008c282dccf0e46ae22a959b4bad2efde204a"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "d530ddbec49588b0d481f156d35f7e5bb7d3b6427d203f04750e55cd3eecc303"
+    sha256 cellar: :any_skip_relocation, arm64_monterey: "9bb6e8c1ef5ba8b019ddedd7e908dd2174da695351aa9a238dfb28b0f57ef005"
+    sha256 cellar: :any_skip_relocation, arm64_big_sur:  "47ffccd3241155d863e1b4f6259d538a34d42a0cdeed8152bda257ee607b51be"
+    sha256 cellar: :any_skip_relocation, monterey:       "dc4a04cb05a9cd1bfa6a632a0e4a21975905954af54ece41f9050c52474267be"
+    sha256 cellar: :any_skip_relocation, big_sur:        "ae469e37864e967e0fd99fba15a78e719dcb351b462f98f3843c78ed1473df6d"
+    sha256 cellar: :any_skip_relocation, catalina:       "291a3eaecb2a2cc845c1652686a9a14b21053d7e3a7d0115245b2150ca2e199e"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:   "710836e27c44c8e3ad181d668f4a9f78c4cb4c355d7b148a397599a7cd42713d"
   end
 
   depends_on "python@3.10"
@@ -25,8 +25,8 @@ class Httpie < Formula
   end
 
   resource "charset-normalizer" do
-    url "https://files.pythonhosted.org/packages/48/44/76b179e0d1afe6e6a91fd5661c284f60238987f3b42b676d141d01cd5b97/charset-normalizer-2.0.10.tar.gz"
-    sha256 "876d180e9d7432c5d1dfd4c5d26b72f099d503e8fcc0feb7532c9289be60fcbd"
+    url "https://files.pythonhosted.org/packages/56/31/7bcaf657fafb3c6db8c787a865434290b726653c912085fbd371e9b92e1c/charset-normalizer-2.0.12.tar.gz"
+    sha256 "2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597"
   end
 
   resource "defusedxml" do
@@ -40,8 +40,8 @@ class Httpie < Formula
   end
 
   resource "multidict" do
-    url "https://files.pythonhosted.org/packages/8e/7c/e12a69795b7b7d5071614af2c691c97fbf16a2a513c66ec52dd7d0a115bb/multidict-5.2.0.tar.gz"
-    sha256 "0dd1c93edb444b33ba2274b66f63def8a327d607c6c790772f448a53b6ea59ce"
+    url "https://files.pythonhosted.org/packages/fa/a7/71c253cdb8a1528802bac7503bf82fe674367e4055b09c28846fdfa4ab90/multidict-6.0.2.tar.gz"
+    sha256 "5ff3bd75f38e4c43f1f470f2df7a4d430b821c4ce22be384e1459cb57d6bb013"
   end
 
   resource "Pygments" do
diff --git a/docs/packaging/brew/update.sh b/docs/packaging/brew/update.sh
new file mode 100755
index 0000000000..7c26ae0ba4
--- /dev/null
+++ b/docs/packaging/brew/update.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -xe
+
+rm -f httpie.rb
+http --download https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/httpie.rb
diff --git a/docs/packaging/linux-arch/PKGBUILD b/docs/packaging/linux-arch/PKGBUILD
index d483fd67b2..5ecec154e8 100644
--- a/docs/packaging/linux-arch/PKGBUILD
+++ b/docs/packaging/linux-arch/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=httpie
 pkgver=2.6.0
 pkgrel=1
 pkgdesc="human-friendly CLI HTTP client for the API era"
-url="https://github.com/httpie/httpie"
+url="https://github.com/httpie/cli"
 depends=('python-defusedxml'
          'python-pygments'
          'python-pysocks'
@@ -22,7 +22,7 @@ conflicts=(python-httpie)
 replaces=(python-httpie python2-httpie)
 license=('BSD')
 arch=('any')
-source=($pkgname-$pkgver.tar.gz::"https://github.com/httpie/httpie/archive/$pkgver.tar.gz")
+source=($pkgname-$pkgver.tar.gz::"https://github.com/httpie/cli/archive/$pkgver.tar.gz")
 sha256sums=('3bcd9a8cb2b11299da12d3af36c095c6d4b665e41c395898a07f1ae4d99fc14a')
 
 build() {
diff --git a/docs/packaging/linux-debian/README.md b/docs/packaging/linux-debian/README.md
index f43ff3c40e..4ec0c0e24e 100644
--- a/docs/packaging/linux-debian/README.md
+++ b/docs/packaging/linux-debian/README.md
@@ -11,19 +11,16 @@ Welcome to the documentation about **packaging HTTPie for Debian GNU/Linux**.
 This document contains technical details, where we describe how to create a patch for the latest HTTPie version for Debian GNU/Linux. They apply to Ubuntu as well, and any Debian-derived distributions like MX Linux, Linux Mint, deepin, Pop!_OS, KDE neon, Zorin OS, elementary OS, Kubuntu, Devuan, Linux Lite, Peppermint OS, Lubuntu, antiX, Xubuntu, etc.
 We will discuss setting up the environment, installing development tools, installing and testing changes before submitting a patch downstream.
 
-The current maintainer is Bartosz Fenski.
+We create the standalone binaries (see this [for more details](../../../extras/packaging/linux/)) and package them with
+[FPM](https://github.com/jordansissel/fpm)'s `dir` mode. The core `http`/`https` commands don't have any dependencies, but the `httpie`
+command (due to the underlying `httpie cli plugins` interface) explicitly depends to the system Python (through `python3`/`python3-pip`).
 
 ## Overall process
 
-Open a new bug on the Debian Bug Tracking System by sending an email:
+The [`Release as Standalone Linux Binary`](https://github.com/httpie/cli/actions/workflows/release-linux-standalone.yml) will be automatically
+triggered when a new release is created, and it will submit the `.deb` package as a release asset.
 
-- To: `Debian Bug Tracking System <submit@bugs.debian.org>`
-- Subject: `httpie: Version XXX available`
-- Message template (examples [1](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=993937), and [2](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=996479)):
-
-  ```email
-  Package: httpie
-  Severity: normal
-
-  <MESSAGE>
-  ```
+For making that asset available for all debian users, the release manager needs to go to the [`httpie/debian.httpie.io`](https://github.com/httpie/debian.httpie.io) repo
+and trigger the [`Update Index`](https://github.com/httpie/debian.httpie.io/actions/workflows/update-index.yml) action. It will automatically
+scrape all new debian packages from the release assets, properly update the indexes and create a new PR ([an example](https://github.com/httpie/debian.httpie.io/pull/1))
+which then will become active when merged.
diff --git a/docs/packaging/linux-fedora/README.md b/docs/packaging/linux-fedora/README.md
index b21e003d25..e8bcf99039 100644
--- a/docs/packaging/linux-fedora/README.md
+++ b/docs/packaging/linux-fedora/README.md
@@ -15,7 +15,7 @@ The current maintainer is [Miro Hrončok](https://github.com/hroncok).
 
 ## Overall process
 
-We added the [.packit.yaml](https://github.com/httpie/httpie/blob/master/.packit.yaml) local file.
+We added the [.packit.yaml](https://github.com/httpie/cli/blob/master/.packit.yaml) local file.
 It unlocks real-time Fedora checks on pull requests and new releases.
 
 So there is nothing to do on our side: `Packit` will see the new release and open a pull request [there](https://src.fedoraproject.org/rpms/httpie). Then, the Fedora maintainer will review and merge.
diff --git a/docs/packaging/linux-fedora/httpie.spec.txt b/docs/packaging/linux-fedora/httpie.spec.txt
index b0ab5b7b3a..3414b188c1 100644
--- a/docs/packaging/linux-fedora/httpie.spec.txt
+++ b/docs/packaging/linux-fedora/httpie.spec.txt
@@ -1,11 +1,11 @@
 Name:           httpie
-Version:        2.6.0
+Version:        3.1.0
 Release:        1%{?dist}
 Summary:        A Curl-like tool for humans
 
 License:        BSD
 URL:            https://httpie.org/
-Source0:        https://github.com/httpie/httpie/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/httpie/cli/archive/%{version}/%{name}-%{version}.tar.gz
 
 BuildArch:      noarch
 
@@ -78,6 +78,25 @@ help2man %{buildroot}%{_bindir}/httpie > %{buildroot}%{_mandir}/man1/httpie.1
 
 
 %changelog
+* Tue Mar 08 2022 Miro Hrončok <mhroncok@redhat.com> - 3.1.0-1
+- Update to 3.1.0
+- Fixes: rhbz#2061597
+
+* Mon Jan 24 2022 Miro Hrončok <mhroncok@redhat.com> - 3.0.2-1
+- Update to 3.0.2
+- Fixes: rhbz#2044572
+
+* Mon Jan 24 2022 Miro Hrončok <mhroncok@redhat.com> - 3.0.1-1
+- Update to 3.0.1
+- Fixes: rhbz#2044058
+
+* Fri Jan 21 2022 Miro Hrončok <mhroncok@redhat.com> - 3.0.0-1
+- Update to 3.0.0
+- Fixes: rhbz#2043680
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Fri Oct 15 2021 Miro Hrončok <mhroncok@redhat.com> - 2.6.0-1
 - Update to 2.6.0
 - Fixes: rhbz#2014022
diff --git a/docs/packaging/linux-fedora/update.sh b/docs/packaging/linux-fedora/update.sh
new file mode 100755
index 0000000000..773bef336c
--- /dev/null
+++ b/docs/packaging/linux-fedora/update.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -xe
+
+rm -f httpie.spec.txt
+https --download src.fedoraproject.org/rpms/httpie/raw/rawhide/f/httpie.spec -o httpie.spec.txt
diff --git a/docs/packaging/mac-ports/README.md b/docs/packaging/mac-ports/README.md
index 2d8170afa4..792638789f 100644
--- a/docs/packaging/mac-ports/README.md
+++ b/docs/packaging/mac-ports/README.md
@@ -19,7 +19,7 @@ Open a pull request to update the [downstream file](https://github.com/macports/
 
   ```bash
   # Download the archive
-  $ wget https://api.github.com/repos/httpie/httpie/tarball/2.5.0
+  $ wget https://api.github.com/repos/httpie/cli/tarball/2.5.0
 
   # Size
   $ stat --printf="%s\n" 2.5.0
diff --git a/docs/packaging/snapcraft/README.md b/docs/packaging/snapcraft/README.md
index b22a00ef80..e7c37c4782 100644
--- a/docs/packaging/snapcraft/README.md
+++ b/docs/packaging/snapcraft/README.md
@@ -13,7 +13,16 @@ We will discuss setting up the environment, installing development tools, instal
 
 ## Overall process
 
-Trigger a new [build](https://snapcraft.io/httpie/builds), then [promote it](https://snapcraft.io/httpie/releases). If more management is needed: [revisions supervision](https://dashboard.snapcraft.io/snaps/httpie/revisions/).
+Trigger the [`Release on Snap`](https://github.com/httpie/cli/actions/workflows/release-snap.yml) action, which will
+create a snap package for HTTPie and then push it to Snap Store in the following channels:
+
+- Edge
+- Beta
+- Candidate
+- Stable
+
+If a push to any of them fail, all the release tasks for the following channels will be cancelled so that the
+release manager can look into the underlying cause.
 
 ## Hacking
 
@@ -28,7 +37,7 @@ From inside the container:
 
 ```bash
 # Clone
-git clone --depth=1 https://github.com/httpie/httpie.git
+git clone --depth=1 https://github.com/httpie/cli.git
 cd httpie
 
 # Build
diff --git a/docs/packaging/windows-chocolatey/README.md b/docs/packaging/windows-chocolatey/README.md
index 588fd7e7d7..33c5d35f11 100644
--- a/docs/packaging/windows-chocolatey/README.md
+++ b/docs/packaging/windows-chocolatey/README.md
@@ -13,18 +13,23 @@ We will discuss setting up the environment, installing development tools, instal
 
 ## Overall process
 
-After having successfully [built and tested](#hacking) the package, push it:
+After having successfully [built and tested](#hacking) the package, either trigger the
+[`Release on Chocolatey`](https://github.com/httpie/cli/actions/workflows/release-choco.yml) action
+to push it to the `Chocolatey` store or use the CLI:
 
 ```bash
 # Replace 2.5.0 with the correct version
 choco push httpie.2.5.0.nupkg -s https://push.chocolatey.org/ --api-key=API_KEY
 ```
 
+Be aware that it might take multiple days until the release is approved, sine it goes through multiple
+sets of reviews (some of them are done manually).
+
 ## Hacking
 
 ```bash
 # Clone
-git clone --depth=1 https://github.com/httpie/httpie.git
+git clone --depth=1 https://github.com/httpie/cli.git
 cd httpie/docs/packaging/windows-chocolatey
 
 # Build
diff --git a/docs/packaging/windows-chocolatey/httpie.nuspec b/docs/packaging/windows-chocolatey/httpie.nuspec
index ce69afa5a7..1d8c69790a 100644
--- a/docs/packaging/windows-chocolatey/httpie.nuspec
+++ b/docs/packaging/windows-chocolatey/httpie.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
 	<metadata>
 		<id>httpie</id>
-		<version>2.6.0</version>
+		<version>3.2.2</version>
 		<summary>Modern, user-friendly command-line HTTP client for the API era</summary>
 		<description>
 HTTPie *aitch-tee-tee-pie* is a user-friendly command-line HTTP client for the API era.
@@ -29,17 +29,17 @@ Main features:
 		<title>HTTPie</title>
 		<authors>HTTPie</authors>
 		<owners>jakubroztocil</owners>
-		<copyright>2012-2021 Jakub Roztocil</copyright>
-		<licenseUrl>https://raw.githubusercontent.com/httpie/httpie/master/LICENSE</licenseUrl>
+		<copyright>2012-2022 Jakub Roztocil</copyright>
+		<licenseUrl>https://raw.githubusercontent.com/httpie/cli/master/LICENSE</licenseUrl>
 		<iconUrl>https://pie-assets.s3.eu-central-1.amazonaws.com/LogoIcons/GB.png</iconUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<releaseNotes>See the [changelog](https://github.com/httpie/httpie/blob/2.6.0/CHANGELOG.md).</releaseNotes>
+		<releaseNotes>See the [changelog](https://github.com/httpie/cli/releases/tag/3.2.2).</releaseNotes>
 		<tags>httpie http https rest api client curl python ssl cli foss oss url</tags>
 		<projectUrl>https://httpie.io</projectUrl>
-		<packageSourceUrl>https://github.com/httpie/httpie/tree/master/docs/packaging/windows-chocolatey</packageSourceUrl>
-		<projectSourceUrl>https://github.com/httpie/httpie</projectSourceUrl>
+		<packageSourceUrl>https://github.com/httpie/cli/tree/master/docs/packaging/windows-chocolatey</packageSourceUrl>
+		<projectSourceUrl>https://github.com/httpie/cli</projectSourceUrl>
 		<docsUrl>https://httpie.io/docs</docsUrl>
-		<bugTrackerUrl>https://github.com/httpie/httpie/issues</bugTrackerUrl>
+		<bugTrackerUrl>https://github.com/httpie/cli/issues</bugTrackerUrl>
 		<dependencies>
 			<dependency id="python3" version="3.7" />
 		</dependencies>
diff --git a/docs/stardust.png b/docs/stardust.png
new file mode 100644
index 0000000000..f95821a425
Binary files /dev/null and b/docs/stardust.png differ
diff --git a/extras/httpie-completion.fish b/extras/httpie-completion.fish
index 5bb32c7605..c0cfc20ad9 100644
--- a/extras/httpie-completion.fish
+++ b/extras/httpie-completion.fish
@@ -1,52 +1,24 @@
 function __fish_httpie_styles
-    echo "
-abap
-algol
-algol_nu
-arduino
-auto
-autumn
-borland
-bw
-colorful
-default
-emacs
-friendly
-fruity
-gruvbox-dark
-gruvbox-light
-igor
-inkpot
-lovelace
-manni
-material
-monokai
-murphy
-native
-paraiso-dark
-paraiso-light
-pastie
-perldoc
-rainbow_dash
-rrt
-sas
-solarized
-solarized-dark
-solarized-light
-stata
-stata-dark
-stata-light
-tango
-trac
-vim
-vs
-xcode
-zenburn"
+    printf '%s\n' abap algol algol_nu arduino auto autumn borland bw colorful default emacs friendly fruity gruvbox-dark gruvbox-light igor inkpot lovelace manni material monokai murphy native paraiso-dark paraiso-light pastie perldoc pie pie-dark pie-light rainbow_dash rrt sas solarized solarized-dark solarized-light stata stata-dark stata-light tango trac vim vs xcode zenburn
+end
+
+function __fish_httpie_mime_types
+    test -r /usr/share/mime/types && cat /usr/share/mime/types
+end
+
+function __fish_httpie_print_args
+    set -l arg (commandline -t)
+    string match -qe H "$arg" || echo -e $arg"H\trequest headers"
+    string match -qe B "$arg" || echo -e $arg"B\trequest body"
+    string match -qe h "$arg" || echo -e $arg"h\tresponse headers"
+    string match -qe b "$arg" || echo -e $arg"b\tresponse body"
+    string match -qe m "$arg" || echo -e $arg"m\tresponse metadata"
 end
 
 function __fish_httpie_auth_types
     echo -e "basic\tBasic HTTP auth"
     echo -e "digest\tDigest HTTP auth"
+    echo -e "bearer\tBearer HTTP Auth"
 end
 
 function __fish_http_verify_options
@@ -54,6 +26,7 @@ function __fish_http_verify_options
     echo -e "no\tDisable cert verification"
 end
 
+
 # Predefined Content Types
 
 complete -c http -s j -l json         -d 'Data items are serialized as a JSON object'
@@ -70,26 +43,28 @@ complete -c http -s x -l compress -d 'Content compressed with Deflate algorithm'
 
 # Output Processing
 
-complete -c http      -l pretty         -xa "all colors format none" -d 'Controls output processing'
-complete -c http -s s -l style          -xa "(__fish_httpie_styles)" -d 'Output coloring style'
-complete -c http      -l unsorted                                    -d 'Disables all sorting while formatting output'
-complete -c http      -l sorted                                      -d 'Re-enables all sorting options while formatting output'
-complete -c http      -l format-options -x                           -d 'Controls output formatting'
+complete -c http      -l pretty           -xa "all colors format none"     -d 'Controls output processing'
+complete -c http -s s -l style            -xa "(__fish_httpie_styles)"     -d 'Output coloring style'
+complete -c http      -l unsorted                                          -d 'Disables all sorting while formatting output'
+complete -c http      -l sorted                                            -d 'Re-enables all sorting options while formatting output'
+complete -c http      -l response-charset -x                               -d 'Override the response encoding'
+complete -c http      -l response-mime    -xa "(__fish_httpie_mime_types)" -d 'Override the response mime type for coloring and formatting'
+complete -c http      -l format-options   -x                               -d 'Controls output formatting'
 
 
 # Output Options
 
-complete -c http -s p -l print         -x -d 'String specifying what the output should contain'
-complete -c http -s h -l headers          -d 'Print only the response headers'
-complete -c http -s b -l body             -d 'Print only the response body'
-complete -c http -s v -l verbose          -d 'Print the whole request as well as the response'
-complete -c http      -l all              -d 'Show any intermediary requests/responses'
-complete -c http -s P -l history-print -x -d 'The same as --print but applies only to intermediary requests/responses'
-complete -c http -s S -l stream           -d 'Always stream the response body by line'
-complete -c http -s o -l output        -F -d 'Save output to FILE'
-complete -c http -s d -l download         -d 'Download a file'
-complete -c http -s c -l continue         -d 'Resume an interrupted download'
-complete -c http -s q -l quiet            -d 'Do not print to stdout or stderr'
+complete -c http -s p -l print         -xa "(__fish_httpie_print_args)" -d 'String specifying what the output should contain'
+complete -c http -s h -l headers                                        -d 'Print only the response headers'
+complete -c http -s m -l meta                                           -d 'Print only the response metadata'
+complete -c http -s b -l body                                           -d 'Print only the response body'
+complete -c http -s v -l verbose                                        -d 'Print the whole request as well as the response'
+complete -c http      -l all                                            -d 'Show any intermediary requests/responses'
+complete -c http -s S -l stream                                         -d 'Always stream the response body by line'
+complete -c http -s o -l output        -F                               -d 'Save output to FILE'
+complete -c http -s d -l download                                       -d 'Download a file'
+complete -c http -s c -l continue                                       -d 'Resume an interrupted download'
+complete -c http -s q -l quiet                                          -d 'Do not print to stdout or stderr'
 
 
 # Sessions
@@ -115,23 +90,30 @@ complete -c http      -l max-headers   -x -d 'Maximum number of response headers
 complete -c http      -l timeout       -x -d 'Connection timeout in seconds'
 complete -c http      -l check-status     -d 'Error with non-200 HTTP status code'
 complete -c http      -l path-as-is       -d 'Bypass dot segment URL squashing'
-complete -c http      -l chunked          -d ''
+complete -c http      -l chunked          -d 'Enable streaming via chunked transfer encoding'
 
 
 # SSL
 
-complete -c http -l verify   -xa "(__fish_http_verify_options)" -d 'Enable/disable cert verification'
-complete -c http -l ssl      -x                                 -d 'Desired protocol version to use'
-complete -c http -l ciphers  -x                                 -d 'String in the OpenSSL cipher list format'
-complete -c http -l cert     -F                                 -d 'Client side SSL certificate'
-complete -c http -l cert-key -F                                 -d 'Private key to use with SSL'
+complete -c http -l verify        -xa "(__fish_http_verify_options)" -d 'Enable/disable cert verification'
+complete -c http -l ssl           -x                                 -d 'Desired protocol version to use'
+complete -c http -l ciphers       -x                                 -d 'String in the OpenSSL cipher list format'
+complete -c http -l cert          -F                                 -d 'Client side SSL certificate'
+complete -c http -l cert-key      -F                                 -d 'Private key to use with SSL'
+complete -c http -l cert-key-pass -x                                 -d 'Passphrase for the given private key'
 
 
 # Troubleshooting
 
 complete -c http -s I -l ignore-stdin      -d 'Do not attempt to read stdin'
 complete -c http      -l help              -d 'Show help'
+complete -c http      -l manual            -d 'Show the full manual'
 complete -c http      -l version           -d 'Show version'
 complete -c http      -l traceback         -d 'Prints exception traceback should one occur'
 complete -c http      -l default-scheme -x -d 'The default scheme to use'
 complete -c http      -l debug             -d 'Show debugging output'
+
+
+# Alias for https to http
+
+complete -c https -w http
diff --git a/extras/man/http.1 b/extras/man/http.1
new file mode 100644
index 0000000000..889e82b31d
--- /dev/null
+++ b/extras/man/http.1
@@ -0,0 +1,600 @@
+.\" This file is auto-generated from the parser declaration in httpie/cli/definition.py by extras/scripts/generate_man_pages.py.
+.TH http 1 "2024-11-01" "HTTPie 3.2.4" "HTTPie Manual"
+.SH NAME
+http
+.SH SYNOPSIS
+http [METHOD] URL [REQUEST_ITEM ...]
+
+.SH DESCRIPTION
+HTTPie: modern, user-friendly command-line HTTP client for the API era. <https://httpie.io>
+.SH Positional arguments
+
+These arguments come after any flags and in the order they are listed here.
+Only URL is required.
+
+.IP "\fB\,METHOD\/\fR"
+
+
+The HTTP method to be used for the request (GET, POST, PUT, DELETE, ...).
+
+This argument can be omitted in which case HTTPie will use POST if there
+is some data to be sent, otherwise GET:
+
+    $ http example.org               # => GET
+    $ http example.org hello=world   # => POST
+
+
+
+.IP "\fB\,URL\/\fR"
+
+
+The request URL. Scheme defaults to \[aq]http://\[aq] if the URL
+does not include one. (You can override this with: \fB\,--default-scheme\/\fR=http/https)
+
+You can also use a shorthand for localhost
+
+    $ http :3000                    # => http://localhost:3000
+    $ http :/foo                    # => http://localhost/foo
+
+
+
+.IP "\fB\,REQUEST_ITEM\/\fR"
+
+
+Optional key-value pairs to be included in the request. The separator used
+determines the type:
+
+\[aq]:\[aq] HTTP headers:
+
+    Referer:https://httpie.io  Cookie:foo=bar  User-Agent:bacon/1.0
+
+\[aq]==\[aq] URL parameters to be appended to the request URI:
+
+    search==httpie
+
+\[aq]=\[aq] Data fields to be serialized into a JSON object (with \fB\,--json\/\fR, \fB\,-j\/\fR)
+    or form data (with \fB\,--form\/\fR, \fB\,-f\/\fR):
+
+    name=HTTPie  language=Python  description=\[aq]CLI HTTP client\[aq]
+
+\[aq]:=\[aq] Non-string JSON data fields (only with \fB\,--json\/\fR, \fB\,-j\/\fR):
+
+    awesome:=true  amount:=42  colors:=\[aq][\[dq]red\[dq], \[dq]green\[dq], \[dq]blue\[dq]]\[aq]
+
+\[aq]@\[aq] Form file fields (only with \fB\,--form\/\fR or \fB\,--multipart\/\fR):
+
+    cv@\(ti/Documents/CV.pdf
+    cv@\[aq]\(ti/Documents/CV.pdf;type=application/pdf\[aq]
+
+\[aq]=@\[aq] A data field like \[aq]=\[aq], but takes a file path and embeds its content:
+
+    essay=@Documents/essay.txt
+
+\[aq]:=@\[aq] A raw JSON field like \[aq]:=\[aq], but takes a file path and embeds its content:
+
+    package:=@./package.json
+
+You can use a backslash to escape a colliding separator in the field name:
+
+    field-name-with\e:colon=value
+
+
+
+.PP
+.SH Predefined content types
+.IP "\fB\,--json\/\fR, \fB\,-j\/\fR"
+
+
+(default) Data items from the command line are serialized as a JSON object.
+The Content-Type and Accept headers are set to application/json
+(if not specified).
+
+
+
+.IP "\fB\,--form\/\fR, \fB\,-f\/\fR"
+
+
+Data items from the command line are serialized as form fields.
+
+The Content-Type is set to application/x-www-form-urlencoded (if not
+specified). The presence of any file fields results in a
+multipart/form-data request.
+
+
+
+.IP "\fB\,--multipart\/\fR"
+
+
+Similar to \fB\,--form\/\fR, but always sends a multipart/form-data request (i.e., even without files).
+
+
+.IP "\fB\,--boundary\/\fR"
+
+
+Specify a custom boundary string for multipart/form-data requests. Only has effect only together with \fB\,--form\/\fR.
+
+
+.IP "\fB\,--raw\/\fR"
+
+
+This option allows you to pass raw request data without extra processing
+(as opposed to the structured request items syntax):
+
+    $ http \fB\,--raw\/\fR=\[aq]data\[aq] pie.dev/post
+
+You can achieve the same by piping the data via stdin:
+
+    $ echo data | http pie.dev/post
+
+Or have HTTPie load the raw data from a file:
+
+    $ http pie.dev/post @data.txt
+
+
+
+
+.PP
+.SH Content processing options
+.IP "\fB\,--compress\/\fR, \fB\,-x\/\fR"
+
+
+Content compressed (encoded) with Deflate algorithm.
+The Content-Encoding header is set to deflate.
+
+Compression is skipped if it appears that compression ratio is
+negative. Compression can be forced by repeating the argument.
+
+
+
+.PP
+.SH Output processing
+.IP "\fB\,--pretty\/\fR"
+
+
+Controls output processing. The value can be \[dq]none\[dq] to not prettify
+the output (default for redirected output), \[dq]all\[dq] to apply both colors
+and formatting (default for terminal output), \[dq]colors\[dq], or \[dq]format\[dq].
+
+
+
+.IP "\fB\,--style\/\fR, \fB\,-s\/\fR \fI\,STYLE\/\fR"
+
+
+Output coloring style (default is \[dq]auto\[dq]). It can be one of:
+
+    auto, pie, pie-dark, pie-light, solarized
+
+
+For finding out all available styles in your system, try:
+
+$ http \fB\,--style\/\fR
+
+The \[dq]auto\[dq] style follows your terminal\[aq]s ANSI color styles.
+For non-auto styles to work properly, please make sure that the
+$TERM environment variable is set to \[dq]xterm-256color\[dq] or similar
+(e.g., via `export TERM=xterm-256color\[aq] in your \(ti/.bashrc).
+
+.IP "\fB\,--unsorted\/\fR"
+
+
+Disables all sorting while formatting output. It is a shortcut for:
+
+    \fB\,--format-options\/\fR=headers.sort:false,json.sort_keys:false
+
+
+
+.IP "\fB\,--sorted\/\fR"
+
+
+Re-enables all sorting options while formatting output. It is a shortcut for:
+
+    \fB\,--format-options\/\fR=headers.sort:true,json.sort_keys:true
+
+
+
+.IP "\fB\,--response-charset\/\fR \fI\,ENCODING\/\fR"
+
+
+Override the response encoding for terminal display purposes, e.g.:
+
+    \fB\,--response-charset\/\fR=utf8
+    \fB\,--response-charset\/\fR=big5
+
+
+
+.IP "\fB\,--response-mime\/\fR \fI\,MIME_TYPE\/\fR"
+
+
+Override the response mime type for coloring and formatting for the terminal, e.g.:
+
+    \fB\,--response-mime\/\fR=application/json
+    \fB\,--response-mime\/\fR=text/xml
+
+
+
+.IP "\fB\,--format-options\/\fR"
+
+
+Controls output formatting. Only relevant when formatting is enabled
+through (explicit or implied) \fB\,--pretty\/\fR=all or \fB\,--pretty\/\fR=format.
+The following are the default options:
+
+    headers.sort:true
+    json.format:true
+    json.indent:4
+    json.sort_keys:true
+    xml.format:true
+    xml.indent:2
+
+You may use this option multiple times, as well as specify multiple
+comma-separated options at the same time. For example, this modifies the
+settings to disable the sorting of JSON keys, and sets the indent size to 2:
+
+    \fB\,--format-options\/\fR json.sort_keys:false,json.indent:2
+
+This is something you will typically put into your config file.
+
+
+
+.PP
+.SH Output options
+.IP "\fB\,--print\/\fR, \fB\,-p\/\fR \fI\,WHAT\/\fR"
+
+
+String specifying what the output should contain:
+
+    \[aq]H\[aq] request headers
+    \[aq]B\[aq] request body
+    \[aq]h\[aq] response headers
+    \[aq]b\[aq] response body
+    \[aq]m\[aq] response metadata
+
+The default behaviour is \[aq]hb\[aq] (i.e., the response
+headers and body is printed), if standard output is not redirected.
+If the output is piped to another program or to a file, then only the
+response body is printed by default.
+
+
+
+.IP "\fB\,--headers\/\fR, \fB\,-h\/\fR"
+
+
+Print only the response headers. Shortcut for \fB\,--print\/\fR=h.
+
+
+
+.IP "\fB\,--meta\/\fR, \fB\,-m\/\fR"
+
+
+Print only the response metadata. Shortcut for \fB\,--print\/\fR=m.
+
+
+
+.IP "\fB\,--body\/\fR, \fB\,-b\/\fR"
+
+
+Print only the response body. Shortcut for \fB\,--print\/\fR=b.
+
+
+
+.IP "\fB\,--verbose\/\fR, \fB\,-v\/\fR"
+
+
+Verbose output. For the level one (with single `\fB\,-v\/\fR`/`\fB\,--verbose\/\fR`), print
+the whole request as well as the response. Also print any intermediary
+requests/responses (such as redirects). For the second level and higher,
+print these as well as the response metadata.
+
+Level one is a shortcut for: \fB\,--all\/\fR \fB\,--print\/\fR=BHbh
+Level two is a shortcut for: \fB\,--all\/\fR \fB\,--print\/\fR=BHbhm
+
+
+.IP "\fB\,--all\/\fR"
+
+
+By default, only the final request/response is shown. Use this flag to show
+any intermediary requests/responses as well. Intermediary requests include
+followed redirects (with \fB\,--follow\/\fR), the first unauthorized request when
+Digest auth is used (\fB\,--auth\/\fR=digest), etc.
+
+
+
+.IP "\fB\,--stream\/\fR, \fB\,-S\/\fR"
+
+
+Always stream the response body by line, i.e., behave like `tail \fB\,-f\/\fR\[aq].
+
+Without \fB\,--stream\/\fR and with \fB\,--pretty\/\fR (either set or implied),
+HTTPie fetches the whole response before it outputs the processed data.
+
+Set this option when you want to continuously display a prettified
+long-lived response, such as one from the Twitter streaming API.
+
+It is useful also without \fB\,--pretty\/\fR: It ensures that the output is flushed
+more often and in smaller chunks.
+
+
+
+.IP "\fB\,--output\/\fR, \fB\,-o\/\fR \fI\,FILE\/\fR"
+
+
+Save output to FILE instead of stdout. If \fB\,--download\/\fR is also set, then only
+the response body is saved to FILE. Other parts of the HTTP exchange are
+printed to stderr.
+
+
+
+.IP "\fB\,--download\/\fR, \fB\,-d\/\fR"
+
+
+Do not print the response body to stdout. Rather, download it and store it
+in a file. The filename is guessed unless specified with \fB\,--output\/\fR
+[filename]. This action is similar to the default behaviour of wget.
+
+
+
+.IP "\fB\,--continue\/\fR, \fB\,-c\/\fR"
+
+
+Resume an interrupted download. Note that the \fB\,--output\/\fR option needs to be
+specified as well.
+
+
+
+.IP "\fB\,--quiet\/\fR, \fB\,-q\/\fR"
+
+
+Do not print to stdout or stderr, except for errors and warnings when provided once.
+Provide twice to suppress warnings as well.
+stdout is still redirected if \fB\,--output\/\fR is specified.
+Flag doesn\[aq]t affect behaviour of download beyond not printing to terminal.
+
+
+
+.PP
+.SH Sessions
+.IP "\fB\,--session\/\fR \fI\,SESSION_NAME_OR_PATH\/\fR"
+
+
+Create, or reuse and update a session. Within a session, custom headers,
+auth credential, as well as any cookies sent by the server persist between
+requests.
+
+Session files are stored in:
+
+    [HTTPIE_CONFIG_DIR]/<HOST>/<SESSION_NAME>.json.
+
+See the following page to find out your default HTTPIE_CONFIG_DIR:
+
+    https://httpie.io/docs/cli/config-file-directory
+
+
+.IP "\fB\,--session-read-only\/\fR \fI\,SESSION_NAME_OR_PATH\/\fR"
+
+
+Create or read a session without updating it form the request/response
+exchange.
+
+
+
+.PP
+.SH Authentication
+.IP "\fB\,--auth\/\fR, \fB\,-a\/\fR \fI\,USER[:PASS] | TOKEN\/\fR"
+
+
+For username/password based authentication mechanisms (e.g
+basic auth or digest auth) if only the username is provided
+(\fB\,-a\/\fR username), HTTPie will prompt for the password.
+
+
+
+.IP "\fB\,--auth-type\/\fR, \fB\,-A\/\fR"
+
+
+The authentication mechanism to be used. Defaults to \[dq]basic\[dq].
+
+\[dq]basic\[dq]: Basic HTTP auth
+
+\[dq]digest\[dq]: Digest HTTP auth
+
+\[dq]bearer\[dq]: Bearer HTTP Auth
+
+To see all available auth types on your system, including ones installed via plugins, run:
+
+$ http \fB\,--auth-type\/\fR
+
+.IP "\fB\,--ignore-netrc\/\fR"
+
+
+Ignore credentials from .netrc.
+
+
+.PP
+.SH Network
+.IP "\fB\,--offline\/\fR"
+
+
+Build the request and print it but don\(gat actually send it.
+
+
+.IP "\fB\,--proxy\/\fR \fI\,PROTOCOL:PROXY_URL\/\fR"
+
+
+String mapping protocol to the URL of the proxy
+(e.g. http:http://foo.bar:3128). You can specify multiple proxies with
+different protocols. The environment variables $ALL_PROXY, $HTTP_PROXY,
+and $HTTPS_proxy are supported as well.
+
+
+
+.IP "\fB\,--follow\/\fR, \fB\,-F\/\fR"
+
+
+Follow 30x Location redirects.
+
+
+.IP "\fB\,--max-redirects\/\fR"
+
+
+By default, requests have a limit of 30 redirects (works with \fB\,--follow\/\fR).
+
+
+
+.IP "\fB\,--max-headers\/\fR"
+
+
+The maximum number of response headers to be read before giving up (default 0, i.e., no limit).
+
+
+.IP "\fB\,--timeout\/\fR \fI\,SECONDS\/\fR"
+
+
+The connection timeout of the request in seconds.
+The default value is 0, i.e., there is no timeout limit.
+This is not a time limit on the entire response download;
+rather, an error is reported if the server has not issued a response for
+timeout seconds (more precisely, if no bytes have been received on
+the underlying socket for timeout seconds).
+
+
+
+.IP "\fB\,--check-status\/\fR"
+
+
+By default, HTTPie exits with 0 when no network or other fatal errors
+occur. This flag instructs HTTPie to also check the HTTP status code and
+exit with an error if the status indicates one.
+
+When the server replies with a 4xx (Client Error) or 5xx (Server Error)
+status code, HTTPie exits with 4 or 5 respectively. If the response is a
+3xx (Redirect) and \fB\,--follow\/\fR hasn\[aq]t been set, then the exit status is 3.
+Also an error message is written to stderr if stdout is redirected.
+
+
+
+.IP "\fB\,--path-as-is\/\fR"
+
+
+Bypass dot segment (/../ or /./) URL squashing.
+
+
+.IP "\fB\,--chunked\/\fR"
+
+
+Enable streaming via chunked transfer encoding. The Transfer-Encoding header is set to chunked.
+
+
+.PP
+.SH SSL
+.IP "\fB\,--verify\/\fR"
+
+
+Set to \[dq]no\[dq] (or \[dq]false\[dq]) to skip checking the host\[aq]s SSL certificate.
+Defaults to \[dq]yes\[dq] (\[dq]true\[dq]). You can also pass the path to a CA_BUNDLE file
+for private certs. (Or you can set the REQUESTS_CA_BUNDLE environment
+variable instead.)
+
+
+.IP "\fB\,--ssl\/\fR"
+
+
+The desired protocol version to use. This will default to
+SSL v2.3 which will negotiate the highest protocol that both
+the server and your installation of OpenSSL support. Available protocols
+may vary depending on OpenSSL installation (only the supported ones
+are shown here).
+
+
+
+.IP "\fB\,--ciphers\/\fR"
+
+
+
+A string in the OpenSSL cipher list format.
+
+
+See `http \fB\,--help\/\fR` for the default ciphers list on you system.
+
+
+
+
+
+.IP "\fB\,--cert\/\fR"
+
+
+You can specify a local cert to use as client side SSL certificate.
+This file may either contain both private key and certificate or you may
+specify \fB\,--cert-key\/\fR separately.
+
+
+
+.IP "\fB\,--cert-key\/\fR"
+
+
+The private key to use with SSL. Only needed if \fB\,--cert\/\fR is given and the
+certificate file does not contain the private key.
+
+
+
+.IP "\fB\,--cert-key-pass\/\fR"
+
+
+The passphrase to be used to with the given private key. Only needed if \fB\,--cert-key\/\fR
+is given and the key file requires a passphrase.
+If not provided, you\(gall be prompted interactively.
+
+
+.PP
+.SH Troubleshooting
+.IP "\fB\,--ignore-stdin\/\fR, \fB\,-I\/\fR"
+
+
+Do not attempt to read stdin
+
+
+.IP "\fB\,--help\/\fR"
+
+
+Show this help message and exit.
+
+
+.IP "\fB\,--manual\/\fR"
+
+
+Show the full manual.
+
+
+.IP "\fB\,--version\/\fR"
+
+
+Show version and exit.
+
+
+.IP "\fB\,--traceback\/\fR"
+
+
+Prints the exception traceback should one occur.
+
+
+.IP "\fB\,--default-scheme\/\fR"
+
+
+The default scheme to use if not specified in the URL.
+
+
+.IP "\fB\,--debug\/\fR"
+
+
+Prints the exception traceback should one occur, as well as other
+information useful for debugging HTTPie itself and for reporting bugs.
+
+
+
+.PP
+.SH SEE ALSO
+
+For every \fB\,--OPTION\/\fR there is also a \fB\,--no-OPTION\/\fR that reverts OPTION
+to its default value.
+
+Suggestions and bug reports are greatly appreciated:
+https://github.com/httpie/cli/issues
\ No newline at end of file
diff --git a/extras/man/httpie.1 b/extras/man/httpie.1
new file mode 100644
index 0000000000..b44172967b
--- /dev/null
+++ b/extras/man/httpie.1
@@ -0,0 +1,100 @@
+.\" This file is auto-generated from the parser declaration in httpie/manager/cli.py by extras/scripts/generate_man_pages.py.
+.TH httpie 1 "2024-11-01" "HTTPie 3.2.4" "HTTPie Manual"
+.SH NAME
+httpie
+.SH SYNOPSIS
+httpie
+.SH DESCRIPTION
+
+Managing interface for the HTTPie itself. <https://httpie.io/docs#manager>
+
+Be aware that you might be looking for http/https commands for sending
+HTTP requests. This command is only available for managing the HTTTPie
+plugins and the configuration around it.
+
+
+If you are looking for the man pages of http/https commands, try one of the following:
+    $ man http
+    $ man https
+
+
+.SH httpie cli export-args
+Export available options for the CLI
+.IP "\fB\,-f\/\fR, \fB\,--format\/\fR"
+
+Format to export in.
+
+.PP
+.SH httpie cli check-updates
+Check for updates
+.PP
+.SH httpie cli sessions upgrade
+Upgrade the given HTTPie session with the latest layout. A list of changes between different session versions can be found in the official documentation.
+.IP "\fB\,HOSTNAME\/\fR"
+
+The host this session belongs.
+
+.IP "\fB\,SESSION_NAME_OR_PATH\/\fR"
+
+The name or the path for the session that will be upgraded.
+
+.IP "\fB\,--bind-cookies\/\fR"
+
+Bind domainless cookies to the host that session belongs.
+
+.PP
+.SH httpie cli sessions upgrade-all
+Upgrade all named sessions with the latest layout. A list of changes between different session versions can be found in the official documentation.
+.IP "\fB\,--bind-cookies\/\fR"
+
+Bind domainless cookies to the host that session belongs.
+
+.PP
+.SH httpie cli plugins install
+Install the given targets from PyPI or from a local paths.
+.IP "\fB\,TARGET\/\fR"
+
+targets to install
+
+.PP
+.SH httpie cli plugins upgrade
+Upgrade the given plugins
+.IP "\fB\,TARGET\/\fR"
+
+targets to upgrade
+
+.PP
+.SH httpie cli plugins uninstall
+Uninstall the given HTTPie plugins.
+.IP "\fB\,TARGET\/\fR"
+
+targets to install
+
+.PP
+.SH httpie cli plugins list
+List all installed HTTPie plugins.
+.PP
+.SH httpie plugins install
+Install the given targets from PyPI or from a local paths.
+.IP "\fB\,TARGET\/\fR"
+
+targets to install
+
+.PP
+.SH httpie plugins upgrade
+Upgrade the given plugins
+.IP "\fB\,TARGET\/\fR"
+
+targets to upgrade
+
+.PP
+.SH httpie plugins uninstall
+Uninstall the given HTTPie plugins.
+.IP "\fB\,TARGET\/\fR"
+
+targets to install
+
+.PP
+.SH httpie plugins list
+List all installed HTTPie plugins.
+.PP
\ No newline at end of file
diff --git a/extras/man/https.1 b/extras/man/https.1
new file mode 100644
index 0000000000..14434b9a71
--- /dev/null
+++ b/extras/man/https.1
@@ -0,0 +1,600 @@
+.\" This file is auto-generated from the parser declaration in httpie/cli/definition.py by extras/scripts/generate_man_pages.py.
+.TH https 1 "2024-11-01" "HTTPie 3.2.4" "HTTPie Manual"
+.SH NAME
+https
+.SH SYNOPSIS
+https [METHOD] URL [REQUEST_ITEM ...]
+
+.SH DESCRIPTION
+HTTPie: modern, user-friendly command-line HTTP client for the API era. <https://httpie.io>
+.SH Positional arguments
+
+These arguments come after any flags and in the order they are listed here.
+Only URL is required.
+
+.IP "\fB\,METHOD\/\fR"
+
+
+The HTTP method to be used for the request (GET, POST, PUT, DELETE, ...).
+
+This argument can be omitted in which case HTTPie will use POST if there
+is some data to be sent, otherwise GET:
+
+    $ http example.org               # => GET
+    $ http example.org hello=world   # => POST
+
+
+
+.IP "\fB\,URL\/\fR"
+
+
+The request URL. Scheme defaults to \[aq]http://\[aq] if the URL
+does not include one. (You can override this with: \fB\,--default-scheme\/\fR=http/https)
+
+You can also use a shorthand for localhost
+
+    $ http :3000                    # => http://localhost:3000
+    $ http :/foo                    # => http://localhost/foo
+
+
+
+.IP "\fB\,REQUEST_ITEM\/\fR"
+
+
+Optional key-value pairs to be included in the request. The separator used
+determines the type:
+
+\[aq]:\[aq] HTTP headers:
+
+    Referer:https://httpie.io  Cookie:foo=bar  User-Agent:bacon/1.0
+
+\[aq]==\[aq] URL parameters to be appended to the request URI:
+
+    search==httpie
+
+\[aq]=\[aq] Data fields to be serialized into a JSON object (with \fB\,--json\/\fR, \fB\,-j\/\fR)
+    or form data (with \fB\,--form\/\fR, \fB\,-f\/\fR):
+
+    name=HTTPie  language=Python  description=\[aq]CLI HTTP client\[aq]
+
+\[aq]:=\[aq] Non-string JSON data fields (only with \fB\,--json\/\fR, \fB\,-j\/\fR):
+
+    awesome:=true  amount:=42  colors:=\[aq][\[dq]red\[dq], \[dq]green\[dq], \[dq]blue\[dq]]\[aq]
+
+\[aq]@\[aq] Form file fields (only with \fB\,--form\/\fR or \fB\,--multipart\/\fR):
+
+    cv@\(ti/Documents/CV.pdf
+    cv@\[aq]\(ti/Documents/CV.pdf;type=application/pdf\[aq]
+
+\[aq]=@\[aq] A data field like \[aq]=\[aq], but takes a file path and embeds its content:
+
+    essay=@Documents/essay.txt
+
+\[aq]:=@\[aq] A raw JSON field like \[aq]:=\[aq], but takes a file path and embeds its content:
+
+    package:=@./package.json
+
+You can use a backslash to escape a colliding separator in the field name:
+
+    field-name-with\e:colon=value
+
+
+
+.PP
+.SH Predefined content types
+.IP "\fB\,--json\/\fR, \fB\,-j\/\fR"
+
+
+(default) Data items from the command line are serialized as a JSON object.
+The Content-Type and Accept headers are set to application/json
+(if not specified).
+
+
+
+.IP "\fB\,--form\/\fR, \fB\,-f\/\fR"
+
+
+Data items from the command line are serialized as form fields.
+
+The Content-Type is set to application/x-www-form-urlencoded (if not
+specified). The presence of any file fields results in a
+multipart/form-data request.
+
+
+
+.IP "\fB\,--multipart\/\fR"
+
+
+Similar to \fB\,--form\/\fR, but always sends a multipart/form-data request (i.e., even without files).
+
+
+.IP "\fB\,--boundary\/\fR"
+
+
+Specify a custom boundary string for multipart/form-data requests. Only has effect only together with \fB\,--form\/\fR.
+
+
+.IP "\fB\,--raw\/\fR"
+
+
+This option allows you to pass raw request data without extra processing
+(as opposed to the structured request items syntax):
+
+    $ http \fB\,--raw\/\fR=\[aq]data\[aq] pie.dev/post
+
+You can achieve the same by piping the data via stdin:
+
+    $ echo data | http pie.dev/post
+
+Or have HTTPie load the raw data from a file:
+
+    $ http pie.dev/post @data.txt
+
+
+
+
+.PP
+.SH Content processing options
+.IP "\fB\,--compress\/\fR, \fB\,-x\/\fR"
+
+
+Content compressed (encoded) with Deflate algorithm.
+The Content-Encoding header is set to deflate.
+
+Compression is skipped if it appears that compression ratio is
+negative. Compression can be forced by repeating the argument.
+
+
+
+.PP
+.SH Output processing
+.IP "\fB\,--pretty\/\fR"
+
+
+Controls output processing. The value can be \[dq]none\[dq] to not prettify
+the output (default for redirected output), \[dq]all\[dq] to apply both colors
+and formatting (default for terminal output), \[dq]colors\[dq], or \[dq]format\[dq].
+
+
+
+.IP "\fB\,--style\/\fR, \fB\,-s\/\fR \fI\,STYLE\/\fR"
+
+
+Output coloring style (default is \[dq]auto\[dq]). It can be one of:
+
+    auto, pie, pie-dark, pie-light, solarized
+
+
+For finding out all available styles in your system, try:
+
+$ http \fB\,--style\/\fR
+
+The \[dq]auto\[dq] style follows your terminal\[aq]s ANSI color styles.
+For non-auto styles to work properly, please make sure that the
+$TERM environment variable is set to \[dq]xterm-256color\[dq] or similar
+(e.g., via `export TERM=xterm-256color\[aq] in your \(ti/.bashrc).
+
+.IP "\fB\,--unsorted\/\fR"
+
+
+Disables all sorting while formatting output. It is a shortcut for:
+
+    \fB\,--format-options\/\fR=headers.sort:false,json.sort_keys:false
+
+
+
+.IP "\fB\,--sorted\/\fR"
+
+
+Re-enables all sorting options while formatting output. It is a shortcut for:
+
+    \fB\,--format-options\/\fR=headers.sort:true,json.sort_keys:true
+
+
+
+.IP "\fB\,--response-charset\/\fR \fI\,ENCODING\/\fR"
+
+
+Override the response encoding for terminal display purposes, e.g.:
+
+    \fB\,--response-charset\/\fR=utf8
+    \fB\,--response-charset\/\fR=big5
+
+
+
+.IP "\fB\,--response-mime\/\fR \fI\,MIME_TYPE\/\fR"
+
+
+Override the response mime type for coloring and formatting for the terminal, e.g.:
+
+    \fB\,--response-mime\/\fR=application/json
+    \fB\,--response-mime\/\fR=text/xml
+
+
+
+.IP "\fB\,--format-options\/\fR"
+
+
+Controls output formatting. Only relevant when formatting is enabled
+through (explicit or implied) \fB\,--pretty\/\fR=all or \fB\,--pretty\/\fR=format.
+The following are the default options:
+
+    headers.sort:true
+    json.format:true
+    json.indent:4
+    json.sort_keys:true
+    xml.format:true
+    xml.indent:2
+
+You may use this option multiple times, as well as specify multiple
+comma-separated options at the same time. For example, this modifies the
+settings to disable the sorting of JSON keys, and sets the indent size to 2:
+
+    \fB\,--format-options\/\fR json.sort_keys:false,json.indent:2
+
+This is something you will typically put into your config file.
+
+
+
+.PP
+.SH Output options
+.IP "\fB\,--print\/\fR, \fB\,-p\/\fR \fI\,WHAT\/\fR"
+
+
+String specifying what the output should contain:
+
+    \[aq]H\[aq] request headers
+    \[aq]B\[aq] request body
+    \[aq]h\[aq] response headers
+    \[aq]b\[aq] response body
+    \[aq]m\[aq] response metadata
+
+The default behaviour is \[aq]hb\[aq] (i.e., the response
+headers and body is printed), if standard output is not redirected.
+If the output is piped to another program or to a file, then only the
+response body is printed by default.
+
+
+
+.IP "\fB\,--headers\/\fR, \fB\,-h\/\fR"
+
+
+Print only the response headers. Shortcut for \fB\,--print\/\fR=h.
+
+
+
+.IP "\fB\,--meta\/\fR, \fB\,-m\/\fR"
+
+
+Print only the response metadata. Shortcut for \fB\,--print\/\fR=m.
+
+
+
+.IP "\fB\,--body\/\fR, \fB\,-b\/\fR"
+
+
+Print only the response body. Shortcut for \fB\,--print\/\fR=b.
+
+
+
+.IP "\fB\,--verbose\/\fR, \fB\,-v\/\fR"
+
+
+Verbose output. For the level one (with single `\fB\,-v\/\fR`/`\fB\,--verbose\/\fR`), print
+the whole request as well as the response. Also print any intermediary
+requests/responses (such as redirects). For the second level and higher,
+print these as well as the response metadata.
+
+Level one is a shortcut for: \fB\,--all\/\fR \fB\,--print\/\fR=BHbh
+Level two is a shortcut for: \fB\,--all\/\fR \fB\,--print\/\fR=BHbhm
+
+
+.IP "\fB\,--all\/\fR"
+
+
+By default, only the final request/response is shown. Use this flag to show
+any intermediary requests/responses as well. Intermediary requests include
+followed redirects (with \fB\,--follow\/\fR), the first unauthorized request when
+Digest auth is used (\fB\,--auth\/\fR=digest), etc.
+
+
+
+.IP "\fB\,--stream\/\fR, \fB\,-S\/\fR"
+
+
+Always stream the response body by line, i.e., behave like `tail \fB\,-f\/\fR\[aq].
+
+Without \fB\,--stream\/\fR and with \fB\,--pretty\/\fR (either set or implied),
+HTTPie fetches the whole response before it outputs the processed data.
+
+Set this option when you want to continuously display a prettified
+long-lived response, such as one from the Twitter streaming API.
+
+It is useful also without \fB\,--pretty\/\fR: It ensures that the output is flushed
+more often and in smaller chunks.
+
+
+
+.IP "\fB\,--output\/\fR, \fB\,-o\/\fR \fI\,FILE\/\fR"
+
+
+Save output to FILE instead of stdout. If \fB\,--download\/\fR is also set, then only
+the response body is saved to FILE. Other parts of the HTTP exchange are
+printed to stderr.
+
+
+
+.IP "\fB\,--download\/\fR, \fB\,-d\/\fR"
+
+
+Do not print the response body to stdout. Rather, download it and store it
+in a file. The filename is guessed unless specified with \fB\,--output\/\fR
+[filename]. This action is similar to the default behaviour of wget.
+
+
+
+.IP "\fB\,--continue\/\fR, \fB\,-c\/\fR"
+
+
+Resume an interrupted download. Note that the \fB\,--output\/\fR option needs to be
+specified as well.
+
+
+
+.IP "\fB\,--quiet\/\fR, \fB\,-q\/\fR"
+
+
+Do not print to stdout or stderr, except for errors and warnings when provided once.
+Provide twice to suppress warnings as well.
+stdout is still redirected if \fB\,--output\/\fR is specified.
+Flag doesn\[aq]t affect behaviour of download beyond not printing to terminal.
+
+
+
+.PP
+.SH Sessions
+.IP "\fB\,--session\/\fR \fI\,SESSION_NAME_OR_PATH\/\fR"
+
+
+Create, or reuse and update a session. Within a session, custom headers,
+auth credential, as well as any cookies sent by the server persist between
+requests.
+
+Session files are stored in:
+
+    [HTTPIE_CONFIG_DIR]/<HOST>/<SESSION_NAME>.json.
+
+See the following page to find out your default HTTPIE_CONFIG_DIR:
+
+    https://httpie.io/docs/cli/config-file-directory
+
+
+.IP "\fB\,--session-read-only\/\fR \fI\,SESSION_NAME_OR_PATH\/\fR"
+
+
+Create or read a session without updating it form the request/response
+exchange.
+
+
+
+.PP
+.SH Authentication
+.IP "\fB\,--auth\/\fR, \fB\,-a\/\fR \fI\,USER[:PASS] | TOKEN\/\fR"
+
+
+For username/password based authentication mechanisms (e.g
+basic auth or digest auth) if only the username is provided
+(\fB\,-a\/\fR username), HTTPie will prompt for the password.
+
+
+
+.IP "\fB\,--auth-type\/\fR, \fB\,-A\/\fR"
+
+
+The authentication mechanism to be used. Defaults to \[dq]basic\[dq].
+
+\[dq]basic\[dq]: Basic HTTP auth
+
+\[dq]digest\[dq]: Digest HTTP auth
+
+\[dq]bearer\[dq]: Bearer HTTP Auth
+
+To see all available auth types on your system, including ones installed via plugins, run:
+
+$ http \fB\,--auth-type\/\fR
+
+.IP "\fB\,--ignore-netrc\/\fR"
+
+
+Ignore credentials from .netrc.
+
+
+.PP
+.SH Network
+.IP "\fB\,--offline\/\fR"
+
+
+Build the request and print it but don\(gat actually send it.
+
+
+.IP "\fB\,--proxy\/\fR \fI\,PROTOCOL:PROXY_URL\/\fR"
+
+
+String mapping protocol to the URL of the proxy
+(e.g. http:http://foo.bar:3128). You can specify multiple proxies with
+different protocols. The environment variables $ALL_PROXY, $HTTP_PROXY,
+and $HTTPS_proxy are supported as well.
+
+
+
+.IP "\fB\,--follow\/\fR, \fB\,-F\/\fR"
+
+
+Follow 30x Location redirects.
+
+
+.IP "\fB\,--max-redirects\/\fR"
+
+
+By default, requests have a limit of 30 redirects (works with \fB\,--follow\/\fR).
+
+
+
+.IP "\fB\,--max-headers\/\fR"
+
+
+The maximum number of response headers to be read before giving up (default 0, i.e., no limit).
+
+
+.IP "\fB\,--timeout\/\fR \fI\,SECONDS\/\fR"
+
+
+The connection timeout of the request in seconds.
+The default value is 0, i.e., there is no timeout limit.
+This is not a time limit on the entire response download;
+rather, an error is reported if the server has not issued a response for
+timeout seconds (more precisely, if no bytes have been received on
+the underlying socket for timeout seconds).
+
+
+
+.IP "\fB\,--check-status\/\fR"
+
+
+By default, HTTPie exits with 0 when no network or other fatal errors
+occur. This flag instructs HTTPie to also check the HTTP status code and
+exit with an error if the status indicates one.
+
+When the server replies with a 4xx (Client Error) or 5xx (Server Error)
+status code, HTTPie exits with 4 or 5 respectively. If the response is a
+3xx (Redirect) and \fB\,--follow\/\fR hasn\[aq]t been set, then the exit status is 3.
+Also an error message is written to stderr if stdout is redirected.
+
+
+
+.IP "\fB\,--path-as-is\/\fR"
+
+
+Bypass dot segment (/../ or /./) URL squashing.
+
+
+.IP "\fB\,--chunked\/\fR"
+
+
+Enable streaming via chunked transfer encoding. The Transfer-Encoding header is set to chunked.
+
+
+.PP
+.SH SSL
+.IP "\fB\,--verify\/\fR"
+
+
+Set to \[dq]no\[dq] (or \[dq]false\[dq]) to skip checking the host\[aq]s SSL certificate.
+Defaults to \[dq]yes\[dq] (\[dq]true\[dq]). You can also pass the path to a CA_BUNDLE file
+for private certs. (Or you can set the REQUESTS_CA_BUNDLE environment
+variable instead.)
+
+
+.IP "\fB\,--ssl\/\fR"
+
+
+The desired protocol version to use. This will default to
+SSL v2.3 which will negotiate the highest protocol that both
+the server and your installation of OpenSSL support. Available protocols
+may vary depending on OpenSSL installation (only the supported ones
+are shown here).
+
+
+
+.IP "\fB\,--ciphers\/\fR"
+
+
+
+A string in the OpenSSL cipher list format.
+
+
+See `http \fB\,--help\/\fR` for the default ciphers list on you system.
+
+
+
+
+
+.IP "\fB\,--cert\/\fR"
+
+
+You can specify a local cert to use as client side SSL certificate.
+This file may either contain both private key and certificate or you may
+specify \fB\,--cert-key\/\fR separately.
+
+
+
+.IP "\fB\,--cert-key\/\fR"
+
+
+The private key to use with SSL. Only needed if \fB\,--cert\/\fR is given and the
+certificate file does not contain the private key.
+
+
+
+.IP "\fB\,--cert-key-pass\/\fR"
+
+
+The passphrase to be used to with the given private key. Only needed if \fB\,--cert-key\/\fR
+is given and the key file requires a passphrase.
+If not provided, you\(gall be prompted interactively.
+
+
+.PP
+.SH Troubleshooting
+.IP "\fB\,--ignore-stdin\/\fR, \fB\,-I\/\fR"
+
+
+Do not attempt to read stdin
+
+
+.IP "\fB\,--help\/\fR"
+
+
+Show this help message and exit.
+
+
+.IP "\fB\,--manual\/\fR"
+
+
+Show the full manual.
+
+
+.IP "\fB\,--version\/\fR"
+
+
+Show version and exit.
+
+
+.IP "\fB\,--traceback\/\fR"
+
+
+Prints the exception traceback should one occur.
+
+
+.IP "\fB\,--default-scheme\/\fR"
+
+
+The default scheme to use if not specified in the URL.
+
+
+.IP "\fB\,--debug\/\fR"
+
+
+Prints the exception traceback should one occur, as well as other
+information useful for debugging HTTPie itself and for reporting bugs.
+
+
+
+.PP
+.SH SEE ALSO
+
+For every \fB\,--OPTION\/\fR there is also a \fB\,--no-OPTION\/\fR that reverts OPTION
+to its default value.
+
+Suggestions and bug reports are greatly appreciated:
+https://github.com/httpie/cli/issues
\ No newline at end of file
diff --git a/extras/packaging/linux/Dockerfile b/extras/packaging/linux/Dockerfile
new file mode 100644
index 0000000000..ea441fd613
--- /dev/null
+++ b/extras/packaging/linux/Dockerfile
@@ -0,0 +1,33 @@
+# Use the oldest (but still supported) Ubuntu as the base for PyInstaller
+# packages. This will prevent stuff like glibc from conflicting.
+FROM ubuntu:18.04
+
+RUN apt-get update
+RUN apt-get install -y software-properties-common binutils
+RUN apt-get install -y ruby-dev
+RUN gem install fpm
+
+# Use deadsnakes for the latest Pythons (e.g 3.9)
+RUN add-apt-repository ppa:deadsnakes/ppa
+RUN apt-get update && apt-get install -y python3.9 python3.9-dev python3.9-venv
+
+# Install rpm as well, since we are going to build fedora dists too
+RUN apt-get install -y rpm
+
+ADD . /app
+WORKDIR /app/extras/packaging/linux
+
+ENV VIRTUAL_ENV=/opt/venv
+RUN python3.9 -m venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+# Ensure that pip is renewed, otherwise we would be using distro-provided pip
+# which strips vendored packages and doesn't work with PyInstaller.
+RUN python -m pip install /app
+RUN python -m pip install pyinstaller wheel
+RUN python -m pip install --force-reinstall --upgrade pip
+
+RUN echo 'BUILD_CHANNEL="pypi"' > /app/httpie/internal/__build_channel__.py
+RUN python build.py
+
+ENTRYPOINT ["mv", "/app/extras/packaging/linux/dist/", "/artifacts"]
diff --git a/extras/packaging/linux/README.md b/extras/packaging/linux/README.md
new file mode 100644
index 0000000000..ab18bfd02f
--- /dev/null
+++ b/extras/packaging/linux/README.md
@@ -0,0 +1,52 @@
+# Standalone Linux Packages
+
+![packaging.png](https://user-images.githubusercontent.com/47358913/159950478-2d090d1b-69b9-4914-a1b4-d3e3d8e25fe0.png)
+
+This directory contains the build scripts for creating:
+
+- A self-contained binary executable for the HTTPie itself
+- `httpie.deb` and `httpie.rpm` packages for Debian and Fedora.
+
+The process of constructing them are fully automated, and can be easily done through the [`Release as Standalone Linux Package`](https://github.com/httpie/cli/actions/workflows/release-linux-standalone.yml)
+action. Once it finishes, the release artifacts will be attached in the summary page of the triggered run.
+
+
+## Hacking
+
+The main entry point for the package builder is the [`build.py`](https://github.com/httpie/cli/blob/master/extras/packaging/linux/build.py). It
+contains 2 major methods:
+
+- `build_binaries`, for the self-contained executables
+- `build_packages`, for the OS-specific packages (which wrap the binaries)
+
+### `build_binaries`
+
+We use [PyInstaller](https://pyinstaller.readthedocs.io/en/stable/) for the binaries. Normally pyinstaller offers two different modes:
+
+- Single directory (harder to distribute, low redundancy. Library files are shared across different executables)
+- Single binary (easier to distribute, higher redundancy. Same libraries are statically linked to different executables, so higher total size)
+
+Since our binary size (in total 20 MiBs) is not that big, we have decided to choose the single binary mode for the sake of easier distribution.
+
+We also disable `UPX`, which is a runtime decompression method since it adds some startup cost.
+
+### `build_packages`
+
+We build our OS-specific packages with [FPM](https://github.com/jordansissel/fpm) which offers a really nice abstraction. We use the `dir` mode,
+and package `http`, `https` and `httpie` commands. More can be added to the `files` option.
+
+Since the `httpie` depends on having a pip executable, we explicitly depend on the system Python even though the core does not use it.
+
+### Docker Image
+
+This directory also contains a [docker image](https://github.com/httpie/cli/blob/master/extras/packaging/linux/Dockerfile) which helps
+building our standalone binaries in an isolated environment with the lowest possible library versions. This is important, since even though
+the executables are standalone they still depend on some main system C libraries (like `glibc`) so we need to create our executables inside
+an environment with a very old (but not deprecated) glibc version. It makes us soundproof for all active Ubuntu/Debian versions.
+
+It also contains the Python version we package our HTTPie with, so it is the place if you need to change it.
+
+### `./get_release_artifacts.sh`
+
+If you make a change in the `build.py`, run the following script to test it out. It will return multiple files under `artifacts/dist` which
+then you can test out and ensure their quality (it is also the script that we use in our automation).
diff --git a/extras/packaging/linux/build.py b/extras/packaging/linux/build.py
new file mode 100644
index 0000000000..9f02136923
--- /dev/null
+++ b/extras/packaging/linux/build.py
@@ -0,0 +1,109 @@
+import stat
+import subprocess
+from pathlib import Path
+from typing import Iterator, Tuple
+
+BUILD_DIR = Path(__file__).parent
+HTTPIE_DIR = BUILD_DIR.parent.parent.parent
+
+EXTRAS_DIR = HTTPIE_DIR / 'extras'
+MAN_PAGES_DIR = EXTRAS_DIR /  'man'
+
+SCRIPT_DIR = BUILD_DIR / Path('scripts')
+HOOKS_DIR = SCRIPT_DIR / 'hooks'
+
+DIST_DIR = BUILD_DIR / 'dist'
+
+TARGET_SCRIPTS = {
+    SCRIPT_DIR / 'http_cli.py': [],
+    SCRIPT_DIR / 'httpie_cli.py': ['--hidden-import=pip'],
+}
+
+
+def build_binaries() -> Iterator[Tuple[str, Path]]:
+    for target_script, extra_args in TARGET_SCRIPTS.items():
+        subprocess.check_call(
+            [
+                'pyinstaller',
+                '--onefile',
+                '--noupx',
+                '-p',
+                HTTPIE_DIR,
+                '--additional-hooks-dir',
+                HOOKS_DIR,
+                *extra_args,
+                target_script,
+            ]
+        )
+
+    for executable_path in DIST_DIR.iterdir():
+        if executable_path.suffix:
+            continue
+        stat_r = executable_path.stat()
+        executable_path.chmod(stat_r.st_mode | stat.S_IEXEC)
+        yield executable_path.stem, executable_path
+
+
+def build_packages(http_binary: Path, httpie_binary: Path) -> None:
+    import httpie
+
+    # Mapping of src_file -> dst_file
+    files = [
+        (http_binary, '/usr/bin/http'),
+        (http_binary, '/usr/bin/https'),
+        (httpie_binary, '/usr/bin/httpie'),
+    ]
+    files.extend(
+        (man_page, f'/usr/share/man/man1/{man_page.name}')
+        for man_page in MAN_PAGES_DIR.glob('*.1')
+    )
+
+    # A list of additional dependencies
+    deps = [
+        'python3 >= 3.7',
+        'python3-pip'
+    ]
+
+    processed_deps = [
+        f'--depends={dep}'
+        for dep in deps
+    ]
+    processed_files = [
+        '='.join([str(src.resolve()), dst]) for src, dst in files
+    ]
+    for target in ['deb', 'rpm']:
+        subprocess.check_call(
+            [
+                'fpm',
+                '--force',
+                '-s',
+                'dir',
+                '-t',
+                target,
+                '--name',
+                'httpie',
+                '--version',
+                httpie.__version__,
+                '--description',
+                httpie.__doc__.strip(),
+                '--license',
+                httpie.__licence__,
+                *processed_deps,
+                *processed_files,
+            ],
+            cwd=DIST_DIR,
+        )
+
+
+def main():
+    binaries = dict(build_binaries())
+    build_packages(binaries['http_cli'], binaries['httpie_cli'])
+
+    # Rename http_cli/httpie_cli to http/httpie
+    binaries['http_cli'].rename(DIST_DIR / 'http')
+    binaries['httpie_cli'].rename(DIST_DIR / 'httpie')
+
+
+
+if __name__ == '__main__':
+    main()
diff --git a/extras/packaging/linux/get_release_artifacts.sh b/extras/packaging/linux/get_release_artifacts.sh
new file mode 100755
index 0000000000..b56e8b83d8
--- /dev/null
+++ b/extras/packaging/linux/get_release_artifacts.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -xe
+
+REPO_ROOT=../../../
+ARTIFACTS_DIR=$(pwd)/artifacts
+
+# Reset the ARTIFACTS_DIR.
+rm -rf $ARTIFACTS_DIR
+mkdir -p $ARTIFACTS_DIR
+
+# Operate on the repository root to have the proper
+# docker context.
+pushd $REPO_ROOT
+
+# Build the PyInstaller image
+docker build -t pyinstaller-httpie -f extras/packaging/linux/Dockerfile .
+
+# Copy the artifacts to the designated directory.
+docker run --rm -i -v $ARTIFACTS_DIR:/artifacts pyinstaller-httpie:latest
+
+popd
diff --git a/extras/packaging/linux/scripts/hooks/hook-pip.py b/extras/packaging/linux/scripts/hooks/hook-pip.py
new file mode 100644
index 0000000000..1dac8fb17f
--- /dev/null
+++ b/extras/packaging/linux/scripts/hooks/hook-pip.py
@@ -0,0 +1,14 @@
+from pathlib import Path
+from PyInstaller.utils.hooks import collect_all
+
+def hook(hook_api):
+    for pkg in [
+        'pip',
+        'setuptools',
+        'distutils',
+        'pkg_resources'
+    ]:
+        datas, binaries, hiddenimports = collect_all(pkg)
+        hook_api.add_datas(datas)
+        hook_api.add_binaries(binaries)
+        hook_api.add_imports(*hiddenimports)
diff --git a/extras/packaging/linux/scripts/http_cli.py b/extras/packaging/linux/scripts/http_cli.py
new file mode 100644
index 0000000000..12ac773fef
--- /dev/null
+++ b/extras/packaging/linux/scripts/http_cli.py
@@ -0,0 +1,5 @@
+from httpie.__main__ import main
+
+if __name__ == '__main__':
+    import sys
+    sys.exit(main())
diff --git a/extras/packaging/linux/scripts/httpie_cli.py b/extras/packaging/linux/scripts/httpie_cli.py
new file mode 100644
index 0000000000..1e979c9521
--- /dev/null
+++ b/extras/packaging/linux/scripts/httpie_cli.py
@@ -0,0 +1,5 @@
+from httpie.manager.__main__ import main
+
+if __name__ == '__main__':
+    import sys
+    sys.exit(main())
diff --git a/extras/profiling/README.md b/extras/profiling/README.md
index c2487de4a6..aff4c68614 100644
--- a/extras/profiling/README.md
+++ b/extras/profiling/README.md
@@ -1,7 +1,7 @@
 # HTTPie Benchmarking Infrastructure
 
 This directory includes the benchmarks we use for testing HTTPie's speed and the
-infrastructure to automate this testing accross versions.
+infrastructure to automate this testing across versions.
 
 ## Usage
 
@@ -10,7 +10,7 @@ Ensure the following requirements are satisfied:
 - Python 3.7+
 - `pyperf`
 
-Then, run the `extras/benchmarks/run.py`:
+Then, run the `extras/profiling/run.py`:
 
 ```console
 $ python extras/profiling/run.py
@@ -28,12 +28,12 @@ on both of them. It will compare the results and print it as a markdown table:
 | Geometric mean                         | (ref)  |     1.10x faster     |
 
 If your `master` branch is not up-to-date, you can get a fresh clone by passing
-`--fresh` option. This way, the benchmark runner will clone the `httpie/httpie`
+`--fresh` option. This way, the benchmark runner will clone the `httpie/cli`
 repo from `GitHub` and use it as the baseline.
 
 You can customize these branches by passing `--local-repo`/`--target-branch`,
 and customize the repos by passing `--local-repo`/`--target-repo` (can either
 take a URL or a path).
 
-If you want to run a third enviroment with additional dependencies (such as
+If you want to run a third environment with additional dependencies (such as
 `pyOpenSSL`), you can pass `--complex`.
diff --git a/extras/profiling/benchmarks.py b/extras/profiling/benchmarks.py
index 5d47a3a125..9d409debbe 100644
--- a/extras/profiling/benchmarks.py
+++ b/extras/profiling/benchmarks.py
@@ -9,11 +9,11 @@
 
 The benchmarks are run through 'pyperf', which allows to
 do get very precise results. For micro-benchmarks like startup,
-please run `pyperf system tune` to get even more acurrate results.
+please run `pyperf system tune` to get even more accurate results.
 
 Examples:
 
-    # Run everything as usual, the default is that we do 3 warmup runs
+    # Run everything as usual, the default is that we do 3 warm-up runs
     # and 5 actual runs.
     $ python extras/profiling/benchmarks.py
 
@@ -21,7 +21,7 @@
     $ python extras/profiling/benchmarks.py --fast
 
     # For verify everything works as expected, pass --debug-single-value.
-    # It will only run everything once, so the resuls are not realiable. But
+    # It will only run everything once, so the resuls are not reliable. But
     # very useful when iterating on a benchmark
     $ python extras/profiling/benchmarks.py --debug-single-value
 
@@ -188,7 +188,7 @@ def run(self, context: Context) -> pyperf.Benchmark:
 def main() -> None:
     # PyPerf will bring it's own argument parser, so configure the script.
     # The somewhat fast and also precise enough configuration is this. We run
-    # benchmarks 3 times to warmup (e.g especially for download benchmark, this
+    # benchmarks 3 times to warm up (e.g especially for download benchmark, this
     # is important). And then 5 actual runs where we record.
     sys.argv.extend(
         ['--worker', '--loops=1', '--warmup=3', '--values=5', '--processes=2']
diff --git a/extras/profiling/run.py b/extras/profiling/run.py
index 8691367316..040e4389e7 100644
--- a/extras/profiling/run.py
+++ b/extras/profiling/run.py
@@ -19,19 +19,19 @@
 Examples:
 
     # Run everything as usual, and compare last commit with master
-    $ python extras/benchmarks/run.py
+    $ python extras/profiling/run.py
 
     # Include complex environments
-    $ python extras/benchmarks/run.py --complex
+    $ python extras/profiling/run.py --complex
 
     # Compare against a fresh copy
-    $ python extras/benchmarks/run.py --fresh
+    $ python extras/profiling/run.py --fresh
 
     # Compare against a custom branch of a custom repo
-    $ python extras/benchmarks/run.py --target-repo my_repo --target-branch my_branch
+    $ python extras/profiling/run.py --target-repo my_repo --target-branch my_branch
 
     # Debug changes made on this script (only run benchmarks once)
-    $ python extras/benchmarks/run.py --debug
+    $ python extras/profiling/run.py --debug
 """
 
 import dataclasses
@@ -50,7 +50,7 @@
 BENCHMARK_SCRIPT = Path(__file__).parent / 'benchmarks.py'
 CURRENT_REPO = Path(__file__).parent.parent.parent
 
-GITHUB_URL = 'https://github.com/httpie/httpie.git'
+GITHUB_URL = 'https://github.com/httpie/cli.git'
 TARGET_BRANCH = 'master'
 
 # Additional dependencies for --complex
diff --git a/extras/scripts/generate_man_pages.py b/extras/scripts/generate_man_pages.py
new file mode 100644
index 0000000000..87939bd5b3
--- /dev/null
+++ b/extras/scripts/generate_man_pages.py
@@ -0,0 +1,188 @@
+import os
+import re
+from contextlib import contextmanager
+from pathlib import Path
+from typing import Optional, Iterator, Iterable
+
+
+# So that httpie.cli.definition can provide man-page-specific output. Must be set before importing httpie.
+os.environ['HTTPIE_BUILDING_MAN_PAGES'] = '1'
+
+import httpie
+from httpie.cli.definition import options as core_options, IS_MAN_PAGE
+from httpie.cli.options import ParserSpec
+from httpie.manager.cli import options as manager_options
+from httpie.output.ui.rich_help import OptionsHighlighter, to_usage
+from httpie.output.ui.rich_utils import render_as_string
+
+
+assert IS_MAN_PAGE, 'CLI definition does not understand we’re building man pages'
+
+# Escape certain characters, so they are rendered properly on all terminals.
+# <https://man7.org/linux/man-pages/man7/groff_char.7.html>
+ESCAPE_MAP = {
+    '"': '\[dq]',
+    "'": '\[aq]',
+    '~': '\(ti',
+    '’': "\(ga",
+    '\\': '\e',
+}
+ESCAPE_MAP = {ord(key): value for key, value in ESCAPE_MAP.items()}
+
+EXTRAS_DIR = Path(__file__).parent.parent
+MAN_PAGE_PATH = EXTRAS_DIR / 'man'
+PROJECT_ROOT = EXTRAS_DIR.parent
+
+OPTION_HIGHLIGHT_RE = re.compile(
+    OptionsHighlighter.highlights[0]
+)
+
+
+class ManPageBuilder:
+    def __init__(self):
+        self.source = []
+
+    def title_line(
+        self,
+        full_name: str,
+        program_name: str,
+        program_version: str,
+        last_edit_date: str,
+    ) -> None:
+        self.source.append(
+            f'.TH {program_name} 1 "{last_edit_date}" '
+            f'"{full_name} {program_version}" "{full_name} Manual"'
+        )
+
+    def set_name(self, program_name: str) -> None:
+        with self.section('NAME'):
+            self.write(program_name)
+
+    def write(self, text: str, *, bold: bool = False) -> None:
+        if bold:
+            text = '.B ' + text
+        self.source.append(text)
+
+    def separate(self) -> None:
+        self.source.append('.PP')
+
+    def format_desc(self, desc: str) -> str:
+        description = _escape_and_dedent(desc)
+        description = OPTION_HIGHLIGHT_RE.sub(
+            # Boldify the option part, but don't remove the prefix (start of the match).
+            lambda match: match[1] + self.boldify(match['option']),
+            description
+        )
+        return description
+
+    def add_comment(self, comment: str) -> None:
+        self.source.append(f'.\\" {comment}')
+
+    def add_options(self, options: Iterable[str], *, metavar: Optional[str] = None) -> None:
+        text = ", ".join(map(self.boldify, options))
+        if metavar:
+            text += f' {self.underline(metavar)}'
+        self.write(f'.IP "{text}"')
+
+    def build(self) -> str:
+        return '\n'.join(self.source)
+
+    @contextmanager
+    def section(self, section_name: str) -> Iterator[None]:
+        self.write(f'.SH {section_name}')
+        self.in_section = True
+        yield
+        self.in_section = False
+
+    def underline(self, text: str) -> str:
+        return r'\fI\,{}\/\fR'.format(text)
+
+    def boldify(self, text: str) -> str:
+        return r'\fB\,{}\/\fR'.format(text)
+
+
+def _escape_and_dedent(text: str) -> str:
+    lines = []
+    for should_act, line in enumerate(text.splitlines()):
+        # Only dedent after the first line.
+        if should_act:
+            if line.startswith('    '):
+                line = line[4:]
+
+        lines.append(line)
+    return '\n'.join(lines).translate(ESCAPE_MAP)
+
+
+def to_man_page(program_name: str, spec: ParserSpec, *, is_top_level_cmd: bool = False) -> str:
+    builder = ManPageBuilder()
+    builder.add_comment(
+        f"This file is auto-generated from the parser declaration "
+        + (f"in {Path(spec.source_file).relative_to(PROJECT_ROOT)} " if spec.source_file else "")
+        + f"by {Path(__file__).relative_to(PROJECT_ROOT)}."
+    )
+
+    builder.title_line(
+        full_name='HTTPie',
+        program_name=program_name,
+        program_version=httpie.__version__,
+        last_edit_date=httpie.__date__,
+    )
+    builder.set_name(program_name)
+
+    with builder.section('SYNOPSIS'):
+        # `http` and `https` are commands that can be directly used, so they can have
+        # a valid usage. But `httpie` is a top-level command with multiple sub commands,
+        # so for the synopsis we'll only reference the `httpie` name.
+        if is_top_level_cmd:
+            synopsis = program_name
+        else:
+            synopsis = render_as_string(to_usage(spec, program_name=program_name))
+        builder.write(synopsis)
+
+    with builder.section('DESCRIPTION'):
+        builder.write(spec.description)
+        if spec.man_page_hint:
+            builder.write(spec.man_page_hint)
+
+    for index, group in enumerate(spec.groups, 1):
+        with builder.section(group.name):
+            if group.description:
+                builder.write(group.description)
+
+            for argument in group.arguments:
+                if argument.is_hidden:
+                    continue
+
+                raw_arg = argument.serialize(isolation_mode=True)
+
+                metavar = raw_arg.get('metavar')
+                if raw_arg.get('is_positional'):
+                    # In case of positional arguments, metavar is always equal
+                    # to the list of options (e.g `METHOD`).
+                    metavar = None
+                builder.add_options(raw_arg['options'], metavar=metavar)
+
+                desc = builder.format_desc(raw_arg.get('description', ''))
+                builder.write('\n' + desc + '\n')
+
+            builder.separate()
+
+    if spec.epilog:
+        with builder.section('SEE ALSO'):
+            builder.write(builder.format_desc(spec.epilog))
+
+    return builder.build()
+
+
+def main() -> None:
+    for program_name, spec, config in [
+        ('http', core_options, {}),
+        ('https', core_options, {}),
+        ('httpie', manager_options, {'is_top_level_cmd': True}),
+    ]:
+        with open((MAN_PAGE_PATH / program_name).with_suffix('.1'), 'w') as stream:
+            stream.write(to_man_page(program_name, spec, **config))
+
+
+if __name__ == '__main__':
+    main()
diff --git a/httpie/__init__.py b/httpie/__init__.py
index 7d48b3499c..a4dded9ced 100644
--- a/httpie/__init__.py
+++ b/httpie/__init__.py
@@ -3,6 +3,7 @@
 
 """
 
-__version__ = '3.0.2'
+__version__ = '3.2.4'
+__date__ = '2024-11-01'
 __author__ = 'Jakub Roztocil'
 __licence__ = 'BSD'
diff --git a/httpie/cli/argparser.py b/httpie/cli/argparser.py
index 64481096c7..9bf09b3b73 100644
--- a/httpie/cli/argparser.py
+++ b/httpie/cli/argparser.py
@@ -10,7 +10,8 @@
 from requests.utils import get_netrc_auth
 
 from .argtypes import (
-    AuthCredentials, KeyValueArgType, PARSED_DEFAULT_FORMAT_OPTIONS,
+    AuthCredentials, SSLCredentials, KeyValueArgType,
+    PARSED_DEFAULT_FORMAT_OPTIONS,
     parse_auth,
     parse_format_options,
 )
@@ -47,12 +48,39 @@ def _split_lines(self, text, width):
         text = dedent(text).strip() + '\n\n'
         return text.splitlines()
 
+    def add_usage(self, usage, actions, groups, prefix=None):
+        # Only display the positional arguments
+        displayed_actions = [
+            action
+            for action in actions
+            if not action.option_strings
+        ]
+
+        _, exception, _ = sys.exc_info()
+        if (
+            isinstance(exception, argparse.ArgumentError)
+            and len(exception.args) >= 1
+            and isinstance(exception.args[0], argparse.Action)
+        ):
+            # add_usage path is also taken when you pass an invalid option,
+            # e.g --style=invalid. If something like that happens, we want
+            # to include to action that caused to the invalid usage into
+            # the list of actions we are displaying.
+            displayed_actions.insert(0, exception.args[0])
+
+        super().add_usage(
+            usage,
+            displayed_actions,
+            groups,
+            prefix="usage:\n    "
+        )
+
 
 # TODO: refactor and design type-annotated data structures
 #       for raw args + parsed args and keep things immutable.
 class BaseHTTPieArgumentParser(argparse.ArgumentParser):
-    def __init__(self, *args, formatter_class=HTTPieHelpFormatter, **kwargs):
-        super().__init__(*args, formatter_class=formatter_class, **kwargs)
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         self.env = None
         self.args = None
         self.has_stdin_data = False
@@ -115,9 +143,9 @@ class HTTPieArgumentParser(BaseHTTPieArgumentParser):
 
     """
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, formatter_class=HTTPieHelpFormatter, **kwargs):
         kwargs.setdefault('add_help', False)
-        super().__init__(*args, **kwargs)
+        super().__init__(*args, formatter_class=formatter_class, **kwargs)
 
     # noinspection PyMethodOverriding
     def parse_args(
@@ -127,6 +155,7 @@ def parse_args(
         namespace=None
     ) -> argparse.Namespace:
         self.env = env
+        self.env.args = namespace = namespace or argparse.Namespace()
         self.args, no_options = super().parse_known_args(args, namespace)
         if self.args.debug:
             self.args.traceback = True
@@ -148,6 +177,7 @@ def parse_args(
         self._parse_items()
         self._process_url()
         self._process_auth()
+        self._process_ssl_cert()
 
         if self.args.raw is not None:
             self._body_from_input(self.args.raw)
@@ -230,9 +260,24 @@ def _setup_standard_streams(self):
             self.env.stdout_isatty = False
 
         if self.args.quiet:
+            self.env.quiet = self.args.quiet
             self.env.stderr = self.env.devnull
             if not (self.args.output_file_specified and not self.args.download):
                 self.env.stdout = self.env.devnull
+            self.env.apply_warnings_filter()
+
+    def _process_ssl_cert(self):
+        from httpie.ssl_ import _is_key_file_encrypted
+
+        if self.args.cert_key_pass is None:
+            self.args.cert_key_pass = SSLCredentials(None)
+
+        if (
+            self.args.cert_key is not None
+            and self.args.cert_key_pass.value is None
+            and _is_key_file_encrypted(self.args.cert_key)
+        ):
+            self.args.cert_key_pass.prompt_password(self.args.cert_key)
 
     def _process_auth(self):
         # TODO: refactor & simplify this method.
@@ -512,3 +557,57 @@ def _process_format_options(self):
         for options_group in format_options:
             parsed_options = parse_format_options(options_group, defaults=parsed_options)
         self.args.format_options = parsed_options
+
+    def print_manual(self):
+        from httpie.output.ui import man_pages
+
+        if man_pages.is_available(self.env.program_name):
+            man_pages.display_for(self.env, self.env.program_name)
+            return None
+
+        text = self.format_help()
+        with self.env.rich_console.pager():
+            self.env.rich_console.print(
+                text,
+                highlight=False
+            )
+
+    def print_usage(self, file):
+        from rich.text import Text
+        from httpie.output.ui import rich_help
+
+        whitelist = set()
+        _, exception, _ = sys.exc_info()
+        if (
+            isinstance(exception, argparse.ArgumentError)
+            and len(exception.args) >= 1
+            and isinstance(exception.args[0], argparse.Action)
+            and exception.args[0].option_strings
+        ):
+            # add_usage path is also taken when you pass an invalid option,
+            # e.g --style=invalid. If something like that happens, we want
+            # to include to action that caused to the invalid usage into
+            # the list of actions we are displaying.
+            whitelist.add(exception.args[0].option_strings[0])
+
+        usage_text = Text('usage', style='bold')
+        usage_text.append(':\n    ')
+        usage_text.append(rich_help.to_usage(self.spec, whitelist=whitelist))
+        self.env.rich_error_console.print(usage_text)
+
+    def error(self, message):
+        """Prints a usage message incorporating the message to stderr and
+        exits."""
+        self.print_usage(sys.stderr)
+        self.env.rich_error_console.print(
+            dedent(
+                f'''
+                [bold]error[/bold]:
+                    {message}
+
+                [bold]for more information[/bold]:
+                    run '{self.prog} --help' or visit https://httpie.io/docs/cli
+                '''.rstrip()
+            )
+        )
+        self.exit(2)
diff --git a/httpie/cli/argtypes.py b/httpie/cli/argtypes.py
index 7bc487ea81..8f19c3c51e 100644
--- a/httpie/cli/argtypes.py
+++ b/httpie/cli/argtypes.py
@@ -130,16 +130,11 @@ def tokenize(self, s: str) -> List[Union[str, Escaped]]:
         return tokens
 
 
-class AuthCredentials(KeyValueArg):
-    """Represents parsed credentials."""
-
-    def has_password(self) -> bool:
-        return self.value is not None
-
-    def prompt_password(self, host: str):
-        prompt_text = f'http: password for {self.key}@{host}: '
+class PromptMixin:
+    def _prompt_password(self, prompt: str) -> str:
+        prompt_text = f'http: {prompt}: '
         try:
-            self.value = self._getpass(prompt_text)
+            return self._getpass(prompt_text)
         except (EOFError, KeyboardInterrupt):
             sys.stderr.write('\n')
             sys.exit(0)
@@ -150,6 +145,26 @@ def _getpass(prompt):
         return getpass.getpass(str(prompt))
 
 
+class SSLCredentials(PromptMixin):
+    """Represents the passphrase for the certificate's key."""
+
+    def __init__(self, value: Optional[str]) -> None:
+        self.value = value
+
+    def prompt_password(self, key_file: str) -> None:
+        self.value = self._prompt_password(f'passphrase for {key_file}')
+
+
+class AuthCredentials(KeyValueArg, PromptMixin):
+    """Represents parsed credentials."""
+
+    def has_password(self) -> bool:
+        return self.value is not None
+
+    def prompt_password(self, host: str) -> None:
+        self.value = self._prompt_password(f'password for {self.key}@{host}:')
+
+
 class AuthCredentialsArgType(KeyValueArgType):
     """A key-value arg type that parses credentials."""
 
diff --git a/httpie/cli/constants.py b/httpie/cli/constants.py
index 897e806b4d..09ca19e4af 100644
--- a/httpie/cli/constants.py
+++ b/httpie/cli/constants.py
@@ -9,6 +9,7 @@
 
 HTTP_POST = 'POST'
 HTTP_GET = 'GET'
+HTTP_OPTIONS = 'OPTIONS'
 
 # Various separators used in args
 SEPARATOR_HEADER = ':'
@@ -90,13 +91,19 @@
 })
 
 # Pretty
+
+
+class PrettyOptions(enum.Enum):
+    STDOUT_TTY_ONLY = enum.auto()
+
+
 PRETTY_MAP = {
     'all': ['format', 'colors'],
     'colors': ['colors'],
     'format': ['format'],
     'none': []
 }
-PRETTY_STDOUT_TTY_ONLY = object()
+PRETTY_STDOUT_TTY_ONLY = PrettyOptions.STDOUT_TTY_ONLY
 
 
 DEFAULT_FORMAT_OPTIONS = [
@@ -125,9 +132,3 @@ class RequestType(enum.Enum):
     FORM = enum.auto()
     MULTIPART = enum.auto()
     JSON = enum.auto()
-
-
-OPEN_BRACKET = '['
-CLOSE_BRACKET = ']'
-BACKSLASH = '\\'
-HIGHLIGHTER = '^'
diff --git a/httpie/cli/definition.py b/httpie/cli/definition.py
index 5ccc3a16f9..843b29c9cf 100644
--- a/httpie/cli/definition.py
+++ b/httpie/cli/definition.py
@@ -1,67 +1,66 @@
-"""
-CLI arguments definition.
-
-"""
-from argparse import (FileType, OPTIONAL, SUPPRESS, ZERO_OR_MORE)
-from textwrap import dedent, wrap
-
-from .. import __doc__, __version__
-from .argparser import HTTPieArgumentParser
-from .argtypes import (
-    KeyValueArgType, SessionNameValidator,
-    readable_file_arg, response_charset_type, response_mime_type,
-)
-from .constants import (
-    DEFAULT_FORMAT_OPTIONS, BASE_OUTPUT_OPTIONS, OUTPUT_OPTIONS,
-    OUTPUT_OPTIONS_DEFAULT, OUT_REQ_BODY, OUT_REQ_HEAD,
-    OUT_RESP_BODY, OUT_RESP_HEAD, OUT_RESP_META, PRETTY_MAP, PRETTY_STDOUT_TTY_ONLY,
-    RequestType, SEPARATOR_GROUP_ALL_ITEMS, SEPARATOR_PROXY,
-    SORTED_FORMAT_OPTIONS_STRING,
-    UNSORTED_FORMAT_OPTIONS_STRING,
-)
-from .utils import LazyChoices
-from ..output.formatters.colors import (
-    AUTO_STYLE, DEFAULT_STYLE, get_available_styles
-)
-from ..plugins.builtin import BuiltinAuthPlugin
-from ..plugins.registry import plugin_manager
-from ..sessions import DEFAULT_SESSIONS_DIR
-from ..ssl_ import AVAILABLE_SSL_VERSION_ARG_MAPPING, DEFAULT_SSL_CIPHERS
-
-
-parser = HTTPieArgumentParser(
-    prog='http',
+from __future__ import annotations
+
+import os
+import textwrap
+from argparse import FileType
+
+from httpie import __doc__, __version__
+from httpie.cli.argtypes import (KeyValueArgType, SessionNameValidator,
+                                 SSLCredentials, readable_file_arg,
+                                 response_charset_type, response_mime_type)
+from httpie.cli.constants import (BASE_OUTPUT_OPTIONS, DEFAULT_FORMAT_OPTIONS,
+                                  OUT_REQ_BODY, OUT_REQ_HEAD, OUT_RESP_BODY,
+                                  OUT_RESP_HEAD, OUT_RESP_META, OUTPUT_OPTIONS,
+                                  OUTPUT_OPTIONS_DEFAULT, PRETTY_MAP,
+                                  PRETTY_STDOUT_TTY_ONLY,
+                                  SEPARATOR_GROUP_ALL_ITEMS, SEPARATOR_PROXY,
+                                  SORTED_FORMAT_OPTIONS_STRING,
+                                  UNSORTED_FORMAT_OPTIONS_STRING, RequestType)
+from httpie.cli.options import ParserSpec, Qualifiers, to_argparse
+from httpie.output.formatters.colors import (AUTO_STYLE, DEFAULT_STYLE, BUNDLED_STYLES,
+                                             get_available_styles)
+from httpie.plugins.builtin import BuiltinAuthPlugin
+from httpie.plugins.registry import plugin_manager
+from httpie.ssl_ import AVAILABLE_SSL_VERSION_ARG_MAPPING, DEFAULT_SSL_CIPHERS_STRING
+
+
+# Man pages are static (built when making a release).
+# We use this check to not include generated, system-specific information there (e.g., default --ciphers).
+IS_MAN_PAGE = bool(os.environ.get('HTTPIE_BUILDING_MAN_PAGES'))
+
+
+options = ParserSpec(
+    'http',
     description=f'{__doc__.strip()} <https://httpie.io>',
-    epilog=dedent('''
+    epilog="""
     For every --OPTION there is also a --no-OPTION that reverts OPTION
     to its default value.
 
     Suggestions and bug reports are greatly appreciated:
-
-        https://github.com/httpie/httpie/issues
-
-    '''),
+        https://github.com/httpie/cli/issues
+    """,
+    source_file=__file__
 )
-parser.register('action', 'lazy_choices', LazyChoices)
 
 #######################################################################
 # Positional arguments.
 #######################################################################
 
-positional = parser.add_argument_group(
-    title='Positional Arguments',
-    description=dedent('''
+positional_arguments = options.add_group(
+    'Positional arguments',
+    description="""
     These arguments come after any flags and in the order they are listed here.
     Only URL is required.
-
-    ''')
+    """,
 )
-positional.add_argument(
+
+positional_arguments.add_argument(
     dest='method',
     metavar='METHOD',
-    nargs=OPTIONAL,
+    nargs=Qualifiers.OPTIONAL,
     default=None,
-    help='''
+    short_help='The HTTP method to be used for the request (GET, POST, PUT, DELETE, ...).',
+    help="""
     The HTTP method to be used for the request (GET, POST, PUT, DELETE, ...).
 
     This argument can be omitted in which case HTTPie will use POST if there
@@ -70,29 +69,41 @@
         $ http example.org               # => GET
         $ http example.org hello=world   # => POST
 
-    '''
+    """,
 )
-positional.add_argument(
+positional_arguments.add_argument(
     dest='url',
     metavar='URL',
-    help='''
-    The scheme defaults to 'http://' if the URL does not include one.
-    (You can override this with: --default-scheme=https)
+    short_help='The request URL.',
+    help="""
+    The request URL. Scheme defaults to 'http://' if the URL
+    does not include one. (You can override this with: --default-scheme=http/https)
 
     You can also use a shorthand for localhost
 
         $ http :3000                    # => http://localhost:3000
         $ http :/foo                    # => http://localhost/foo
 
-    '''
+    """,
 )
-positional.add_argument(
+positional_arguments.add_argument(
     dest='request_items',
     metavar='REQUEST_ITEM',
-    nargs=ZERO_OR_MORE,
+    nargs=Qualifiers.ZERO_OR_MORE,
     default=None,
     type=KeyValueArgType(*SEPARATOR_GROUP_ALL_ITEMS),
-    help=r'''
+    short_help=(
+        'HTTPie’s request items syntax for specifying HTTP headers, JSON/Form'
+        'data, files, and URL parameters.'
+    ),
+    nested_options=[
+        ('HTTP Headers', 'Name:Value', 'Arbitrary HTTP header, e.g X-API-Token:123'),
+        ('URL Parameters', 'name==value', 'Querystring parameter to the URL, e.g limit==50'),
+        ('Data Fields', 'field=value', 'Data fields to be serialized as JSON (default) or Form Data (with --form)'),
+        ('Raw JSON Fields', 'field:=json', 'Data field for real JSON types.'),
+        ('File upload Fields', 'field@/dir/file', 'Path field for uploading a file.'),
+    ],
+    help=r"""
     Optional key-value pairs to be included in the request. The separator used
     determines the type:
 
@@ -130,66 +141,66 @@
 
         field-name-with\:colon=value
 
-    '''
+    """,
 )
 
 #######################################################################
 # Content type.
 #######################################################################
 
-content_type = parser.add_argument_group(
-    title='Predefined Content Types',
-    description=None
-)
+content_types = options.add_group('Predefined content types')
 
-content_type.add_argument(
-    '--json', '-j',
+content_types.add_argument(
+    '--json',
+    '-j',
     action='store_const',
     const=RequestType.JSON,
     dest='request_type',
-    help='''
+    short_help='(default) Serialize data items from the command line as a JSON object.',
+    help="""
     (default) Data items from the command line are serialized as a JSON object.
     The Content-Type and Accept headers are set to application/json
     (if not specified).
 
-    '''
+    """,
 )
-content_type.add_argument(
-    '--form', '-f',
+content_types.add_argument(
+    '--form',
+    '-f',
     action='store_const',
     const=RequestType.FORM,
     dest='request_type',
-    help='''
+    short_help='Serialize data items from the command line as form field data.',
+    help="""
     Data items from the command line are serialized as form fields.
 
     The Content-Type is set to application/x-www-form-urlencoded (if not
     specified). The presence of any file fields results in a
     multipart/form-data request.
 
-    '''
+    """,
 )
-content_type.add_argument(
+content_types.add_argument(
     '--multipart',
     action='store_const',
     const=RequestType.MULTIPART,
     dest='request_type',
-    help='''
-    Similar to --form, but always sends a multipart/form-data
-    request (i.e., even without files).
-
-    '''
+    short_help=(
+        'Similar to --form, but always sends a multipart/form-data '
+        'request (i.e., even without files).'
+    )
 )
-content_type.add_argument(
+content_types.add_argument(
     '--boundary',
-    help='''
-    Specify a custom boundary string for multipart/form-data requests.
-    Only has effect only together with --form.
-
-    '''
+    short_help=(
+        'Specify a custom boundary string for multipart/form-data requests. '
+        'Only has effect only together with --form.'
+    )
 )
-content_type.add_argument(
+content_types.add_argument(
     '--raw',
-    help='''
+    short_help='Pass raw request data without extra processing.',
+    help="""
     This option allows you to pass raw request data without extra processing
     (as opposed to the structured request items syntax):
 
@@ -204,149 +215,168 @@
         $ http pie.dev/post @data.txt
 
 
-    '''
+    """,
 )
 
-
 #######################################################################
 # Content processing.
 #######################################################################
 
-content_processing = parser.add_argument_group(
-    title='Content Processing Options',
-    description=None
-)
+processing_options = options.add_group('Content processing options')
 
-content_processing.add_argument(
-    '--compress', '-x',
+processing_options.add_argument(
+    '--compress',
+    '-x',
     action='count',
     default=0,
-    help='''
+    short_help='Compress the content with Deflate algorithm.',
+    help="""
     Content compressed (encoded) with Deflate algorithm.
     The Content-Encoding header is set to deflate.
 
     Compression is skipped if it appears that compression ratio is
     negative. Compression can be forced by repeating the argument.
 
-    '''
+    """,
 )
 
+
 #######################################################################
 # Output processing
 #######################################################################
 
-output_processing = parser.add_argument_group(title='Output Processing')
+
+def format_style_help(available_styles, *, isolation_mode: bool = False):
+    text = """
+    Output coloring style (default is "{default}"). It can be one of:
+
+        {available_styles}
+    """
+    if isolation_mode:
+        text += '\n\n'
+        text += 'For finding out all available styles in your system, try:\n\n'
+        text += '    $ http --style\n'
+    text += textwrap.dedent("""
+        The "{auto_style}" style follows your terminal's ANSI color styles.
+        For non-{auto_style} styles to work properly, please make sure that the
+        $TERM environment variable is set to "xterm-256color" or similar
+        (e.g., via `export TERM=xterm-256color' in your ~/.bashrc).
+    """)
+
+    if isolation_mode:
+        available_styles = sorted(BUNDLED_STYLES)
+
+    available_styles_text = '\n'.join(
+        f'    {line.strip()}'
+        for line in textwrap.wrap(', '.join(available_styles), 60)
+    ).strip()
+    return text.format(
+        default=DEFAULT_STYLE,
+        available_styles=available_styles_text,
+        auto_style=AUTO_STYLE,
+    )
+
+
+_sorted_kwargs = {
+    'action': 'append_const',
+    'const': SORTED_FORMAT_OPTIONS_STRING,
+    'dest': 'format_options',
+}
+_unsorted_kwargs = {
+    'action': 'append_const',
+    'const': UNSORTED_FORMAT_OPTIONS_STRING,
+    'dest': 'format_options',
+}
+
+output_processing = options.add_group('Output processing')
 
 output_processing.add_argument(
     '--pretty',
     dest='prettify',
     default=PRETTY_STDOUT_TTY_ONLY,
     choices=sorted(PRETTY_MAP.keys()),
-    help='''
+    short_help='Control the processing of console outputs.',
+    help="""
     Controls output processing. The value can be "none" to not prettify
     the output (default for redirected output), "all" to apply both colors
     and formatting (default for terminal output), "colors", or "format".
 
-    '''
+    """,
 )
-
-
-def format_style_help(available_styles):
-    return '''
-    Output coloring style (default is "{default}"). It can be one of:
-
-        {available_styles}
-
-    The "{auto_style}" style follows your terminal's ANSI color styles.
-    For non-{auto_style} styles to work properly, please make sure that the
-    $TERM environment variable is set to "xterm-256color" or similar
-    (e.g., via `export TERM=xterm-256color' in your ~/.bashrc).
-    '''.format(
-        default=DEFAULT_STYLE,
-        available_styles='\n'.join(
-            f'        {line.strip()}'
-            for line in wrap(', '.join(available_styles), 60)
-        ).strip(),
-        auto_style=AUTO_STYLE,
-    )
-
-
 output_processing.add_argument(
-    '--style', '-s',
+    '--style',
+    '-s',
     dest='style',
     metavar='STYLE',
     default=DEFAULT_STYLE,
     action='lazy_choices',
     getter=get_available_styles,
-    help_formatter=format_style_help
+    short_help=f'Output coloring style (default is "{DEFAULT_STYLE}").',
+    help_formatter=format_style_help,
 )
 
-_sorted_kwargs = {
-    'action': 'append_const',
-    'const': SORTED_FORMAT_OPTIONS_STRING,
-    'dest': 'format_options'
-}
-_unsorted_kwargs = {
-    'action': 'append_const',
-    'const': UNSORTED_FORMAT_OPTIONS_STRING,
-    'dest': 'format_options'
-}
 # The closest approx. of the documented resetting to default via --no-<option>.
 # We hide them from the doc because they act only as low-level aliases here.
-output_processing.add_argument('--no-unsorted', **_sorted_kwargs, help=SUPPRESS)
-output_processing.add_argument('--no-sorted', **_unsorted_kwargs, help=SUPPRESS)
+output_processing.add_argument(
+    '--no-unsorted', **_sorted_kwargs, help=Qualifiers.SUPPRESS
+)
+output_processing.add_argument(
+    '--no-sorted', **_unsorted_kwargs, help=Qualifiers.SUPPRESS
+)
 
 output_processing.add_argument(
     '--unsorted',
     **_unsorted_kwargs,
-    help=f'''
+    short_help='Disables all sorting while formatting output.',
+    help=f"""
     Disables all sorting while formatting output. It is a shortcut for:
 
         --format-options={UNSORTED_FORMAT_OPTIONS_STRING}
 
-    '''
+    """,
 )
 output_processing.add_argument(
     '--sorted',
     **_sorted_kwargs,
-    help=f'''
+    short_help='Re-enables all sorting options while formatting output.',
+    help=f"""
     Re-enables all sorting options while formatting output. It is a shortcut for:
 
         --format-options={SORTED_FORMAT_OPTIONS_STRING}
 
-    '''
+    """,
 )
-
 output_processing.add_argument(
     '--response-charset',
     metavar='ENCODING',
     type=response_charset_type,
-    help='''
+    short_help='Override the response encoding for terminal display purposes.',
+    help="""
     Override the response encoding for terminal display purposes, e.g.:
 
         --response-charset=utf8
         --response-charset=big5
 
-    '''
+    """,
 )
-
 output_processing.add_argument(
     '--response-mime',
     metavar='MIME_TYPE',
     type=response_mime_type,
-    help='''
+    short_help='Override the response mime type for coloring and formatting for the terminal.',
+    help="""
     Override the response mime type for coloring and formatting for the terminal, e.g.:
 
         --response-mime=application/json
         --response-mime=text/xml
 
-    '''
+    """,
 )
-
 output_processing.add_argument(
     '--format-options',
     action='append',
-    help='''
+    short_help='Controls output formatting.',
+    help="""
     Controls output formatting. Only relevant when formatting is enabled
     through (explicit or implied) --pretty=all or --pretty=format.
     The following are the default options:
@@ -361,22 +391,26 @@ def format_style_help(available_styles):
 
     This is something you will typically put into your config file.
 
-    '''.format(
+    """.format(
         option_list='\n'.join(
-            f'        {option}' for option in DEFAULT_FORMAT_OPTIONS).strip()
-    )
+            f'        {option}' for option in DEFAULT_FORMAT_OPTIONS
+        ).strip()
+    ),
 )
 
 #######################################################################
 # Output options
 #######################################################################
-output_options = parser.add_argument_group(title='Output Options')
+
+output_options = options.add_group('Output options')
 
 output_options.add_argument(
-    '--print', '-p',
+    '--print',
+    '-p',
     dest='output_options',
     metavar='WHAT',
-    help=f'''
+    short_help='Options to specify what the console output should contain.',
+    help=f"""
     String specifying what the output should contain:
 
         '{OUT_REQ_HEAD}' request headers
@@ -390,83 +424,89 @@ def format_style_help(available_styles):
     If the output is piped to another program or to a file, then only the
     response body is printed by default.
 
-    '''
+    """,
 )
 output_options.add_argument(
-    '--headers', '-h',
+    '--headers',
+    '-h',
     dest='output_options',
     action='store_const',
     const=OUT_RESP_HEAD,
-    help=f'''
+    short_help='Print only the response headers.',
+    help=f"""
     Print only the response headers. Shortcut for --print={OUT_RESP_HEAD}.
 
-    '''
+    """,
 )
 output_options.add_argument(
-    '--meta', '-m',
+    '--meta',
+    '-m',
     dest='output_options',
     action='store_const',
     const=OUT_RESP_META,
-    help=f'''
+    short_help='Print only the response metadata.',
+    help=f"""
     Print only the response metadata. Shortcut for --print={OUT_RESP_META}.
 
-    '''
+    """,
 )
 output_options.add_argument(
-    '--body', '-b',
+    '--body',
+    '-b',
     dest='output_options',
     action='store_const',
     const=OUT_RESP_BODY,
-    help=f'''
+    short_help='Print only the response body.',
+    help=f"""
     Print only the response body. Shortcut for --print={OUT_RESP_BODY}.
 
-    '''
+    """,
 )
 
 output_options.add_argument(
-    '--verbose', '-v',
+    '--verbose',
+    '-v',
     dest='verbose',
     action='count',
     default=0,
-    help=f'''
+    short_help='Make output more verbose.',
+    help=f"""
     Verbose output. For the level one (with single `-v`/`--verbose`), print
     the whole request as well as the response. Also print any intermediary
     requests/responses (such as redirects). For the second level and higher,
     print these as well as the response metadata.
 
-    Level one is a shortcut for: --all --print={''.join(BASE_OUTPUT_OPTIONS)}
-    Level two is a shortcut for: --all --print={''.join(OUTPUT_OPTIONS)}
-    '''
+    Level one is a shortcut for: --all --print={''.join(sorted(BASE_OUTPUT_OPTIONS))}
+    Level two is a shortcut for: --all --print={''.join(sorted(OUTPUT_OPTIONS))}
+    """,
 )
 output_options.add_argument(
     '--all',
     default=False,
     action='store_true',
-    help='''
+    short_help='Show any intermediary requests/responses.',
+    help="""
     By default, only the final request/response is shown. Use this flag to show
     any intermediary requests/responses as well. Intermediary requests include
     followed redirects (with --follow), the first unauthorized request when
     Digest auth is used (--auth=digest), etc.
 
-    '''
+    """,
 )
 output_options.add_argument(
-    '--history-print', '-P',
+    '--history-print',
+    '-P',
     dest='output_options_history',
     metavar='WHAT',
-    help='''
-    The same as --print, -p but applies only to intermediary requests/responses
-    (such as redirects) when their inclusion is enabled with --all. If this
-    options is not specified, then they are formatted the same way as the final
-    response.
-
-    '''
+    help=Qualifiers.SUPPRESS,
 )
 output_options.add_argument(
-    '--stream', '-S',
+    '--stream',
+    '-S',
     action='store_true',
     default=False,
-    help='''
+    short_help='Always stream the response body by line, i.e., behave like `tail -f`.',
+    help="""
     Always stream the response body by line, i.e., behave like `tail -f'.
 
     Without --stream and with --pretty (either set or implied),
@@ -478,171 +518,198 @@ def format_style_help(available_styles):
     It is useful also without --pretty: It ensures that the output is flushed
     more often and in smaller chunks.
 
-    '''
+    """,
 )
 output_options.add_argument(
-    '--output', '-o',
+    '--output',
+    '-o',
     type=FileType('a+b'),
     dest='output_file',
     metavar='FILE',
-    help='''
+    short_help='Save output to FILE instead of stdout.',
+    help="""
     Save output to FILE instead of stdout. If --download is also set, then only
     the response body is saved to FILE. Other parts of the HTTP exchange are
     printed to stderr.
 
-    '''
-
+    """,
 )
 
 output_options.add_argument(
-    '--download', '-d',
+    '--download',
+    '-d',
     action='store_true',
     default=False,
-    help='''
+    short_help='Download the body to a file instead of printing it to stdout.',
+    help="""
     Do not print the response body to stdout. Rather, download it and store it
     in a file. The filename is guessed unless specified with --output
     [filename]. This action is similar to the default behaviour of wget.
 
-    '''
+    """,
 )
-
 output_options.add_argument(
-    '--continue', '-c',
+    '--continue',
+    '-c',
     dest='download_resume',
     action='store_true',
     default=False,
-    help='''
+    short_help='Resume an interrupted download (--output needs to be specified).',
+    help="""
     Resume an interrupted download. Note that the --output option needs to be
     specified as well.
 
-    '''
+    """,
 )
-
 output_options.add_argument(
-    '--quiet', '-q',
+    '--quiet',
+    '-q',
     action='count',
     default=0,
-    help='''
+    short_help='Do not print to stdout or stderr, except for errors and warnings when provided once.',
+    help="""
     Do not print to stdout or stderr, except for errors and warnings when provided once.
     Provide twice to suppress warnings as well.
     stdout is still redirected if --output is specified.
     Flag doesn't affect behaviour of download beyond not printing to terminal.
 
-    '''
+    """,
 )
 
 #######################################################################
 # Sessions
 #######################################################################
 
-sessions = parser.add_argument_group(title='Sessions') \
-    .add_mutually_exclusive_group(required=False)
-
 session_name_validator = SessionNameValidator(
     'Session name contains invalid characters.'
 )
 
+sessions = options.add_group('Sessions', is_mutually_exclusive=True)
+
 sessions.add_argument(
     '--session',
     metavar='SESSION_NAME_OR_PATH',
     type=session_name_validator,
-    help=f'''
+    short_help='Create, or reuse and update a session.',
+    help="""
     Create, or reuse and update a session. Within a session, custom headers,
     auth credential, as well as any cookies sent by the server persist between
     requests.
 
     Session files are stored in:
 
-        {DEFAULT_SESSIONS_DIR}/<HOST>/<SESSION_NAME>.json.
+        [HTTPIE_CONFIG_DIR]/<HOST>/<SESSION_NAME>.json.
 
-    '''
+    See the following page to find out your default HTTPIE_CONFIG_DIR:
+
+        https://httpie.io/docs/cli/config-file-directory
+    """,
 )
 sessions.add_argument(
     '--session-read-only',
     metavar='SESSION_NAME_OR_PATH',
     type=session_name_validator,
-    help='''
+    short_help='Create or read a session without updating it',
+    help="""
     Create or read a session without updating it form the request/response
     exchange.
 
-    '''
+    """,
 )
 
+
 #######################################################################
 # Authentication
 #######################################################################
 
-# ``requests.request`` keyword arguments.
-auth = parser.add_argument_group(title='Authentication')
-auth.add_argument(
-    '--auth', '-a',
-    default=None,
-    metavar='USER[:PASS] | TOKEN',
-    help='''
-    For username/password based authentication mechanisms (e.g
-    basic auth or digest auth) if only the username is provided
-    (-a username), HTTPie will prompt for the password.
 
-    ''',
-)
-
-
-def format_auth_help(auth_plugins_mapping):
-    auth_plugins = list(auth_plugins_mapping.values())
-    return '''
+def format_auth_help(auth_plugins_mapping, *, isolation_mode: bool = False):
+    text = """
     The authentication mechanism to be used. Defaults to "{default}".
 
-    {types}
+    {auth_types}
+    """
 
-    '''.format(default=auth_plugins[0].auth_type, types='\n    '.join(
+    auth_plugins = list(auth_plugins_mapping.values())
+    if isolation_mode:
+        auth_plugins = [
+            auth_plugin
+            for auth_plugin in auth_plugins
+            if issubclass(auth_plugin, BuiltinAuthPlugin)
+        ]
+        text += '\n'
+        text += 'To see all available auth types on your system, including ones installed via plugins, run:\n\n'
+        text += '    $ http --auth-type'
+
+    auth_types = '\n\n    '.join(
         '"{type}": {name}{package}{description}'.format(
             type=plugin.auth_type,
             name=plugin.name,
             package=(
-                '' if issubclass(plugin, BuiltinAuthPlugin)
+                ''
+                if issubclass(plugin, BuiltinAuthPlugin)
                 else f' (provided by {plugin.package_name})'
             ),
             description=(
-                '' if not plugin.description else
-                '\n      ' + ('\n      '.join(wrap(plugin.description)))
-            )
+                ''
+                if not plugin.description
+                else '\n      '
+                     + ('\n      '.join(textwrap.wrap(plugin.description)))
+            ),
         )
         for plugin in auth_plugins
-    ))
+    )
+
+    return text.format(
+        default=auth_plugins[0].auth_type,
+        auth_types=auth_types,
+    )
+
 
+authentication = options.add_group('Authentication')
 
-auth.add_argument(
-    '--auth-type', '-A',
+authentication.add_argument(
+    '--auth',
+    '-a',
+    default=None,
+    metavar='USER[:PASS] | TOKEN',
+    short_help='Credentials for the selected (-A) authentication method.',
+    help="""
+    For username/password based authentication mechanisms (e.g
+    basic auth or digest auth) if only the username is provided
+    (-a username), HTTPie will prompt for the password.
+
+    """,
+)
+authentication.add_argument(
+    '--auth-type',
+    '-A',
     action='lazy_choices',
     default=None,
     getter=plugin_manager.get_auth_plugin_mapping,
     sort=True,
     cache=False,
+    short_help='The authentication mechanism to be used.',
     help_formatter=format_auth_help,
 )
-auth.add_argument(
+authentication.add_argument(
     '--ignore-netrc',
     default=False,
     action='store_true',
-    help='''
-    Ignore credentials from .netrc.
-
-    ''',
+    short_help='Ignore credentials from .netrc.'
 )
 
 #######################################################################
 # Network
 #######################################################################
 
-network = parser.add_argument_group(title='Network')
+network = options.add_group('Network')
 
 network.add_argument(
     '--offline',
     default=False,
     action='store_true',
-    help='''
-    Build the request and print it but don’t actually send it.
-    '''
+    short_help='Build the request and print it but don’t actually send it.'
 )
 network.add_argument(
     '--proxy',
@@ -650,43 +717,41 @@ def format_auth_help(auth_plugins_mapping):
     action='append',
     metavar='PROTOCOL:PROXY_URL',
     type=KeyValueArgType(SEPARATOR_PROXY),
-    help='''
+    short_help='String mapping of protocol to the URL of the proxy.',
+    help="""
     String mapping protocol to the URL of the proxy
     (e.g. http:http://foo.bar:3128). You can specify multiple proxies with
     different protocols. The environment variables $ALL_PROXY, $HTTP_PROXY,
     and $HTTPS_proxy are supported as well.
 
-    '''
+    """,
 )
 network.add_argument(
-    '--follow', '-F',
+    '--follow',
+    '-F',
     default=False,
     action='store_true',
-    help='''
-    Follow 30x Location redirects.
-
-    '''
+    short_help='Follow 30x Location redirects.'
 )
 
 network.add_argument(
     '--max-redirects',
     type=int,
     default=30,
-    help='''
+    short_help='The maximum number of redirects that should be followed (with --follow).',
+    help="""
     By default, requests have a limit of 30 redirects (works with --follow).
 
-    '''
+    """,
 )
-
 network.add_argument(
     '--max-headers',
     type=int,
     default=0,
-    help='''
-    The maximum number of response headers to be read before giving up
-    (default 0, i.e., no limit).
-
-    '''
+    short_help=(
+        'The maximum number of response headers to be read before '
+        'giving up (default 0, i.e., no limit).'
+    )
 )
 
 network.add_argument(
@@ -694,7 +759,8 @@ def format_auth_help(auth_plugins_mapping):
     type=float,
     default=0,
     metavar='SECONDS',
-    help='''
+    short_help='The connection timeout of the request in seconds.',
+    help="""
     The connection timeout of the request in seconds.
     The default value is 0, i.e., there is no timeout limit.
     This is not a time limit on the entire response download;
@@ -702,13 +768,14 @@ def format_auth_help(auth_plugins_mapping):
     timeout seconds (more precisely, if no bytes have been received on
     the underlying socket for timeout seconds).
 
-    '''
+    """,
 )
 network.add_argument(
     '--check-status',
     default=False,
     action='store_true',
-    help='''
+    short_help='Exit with an error status code if the server replies with an error.',
+    help="""
     By default, HTTPie exits with 0 when no network or other fatal errors
     occur. This flag instructs HTTPie to also check the HTTP status code and
     exit with an error if the status indicates one.
@@ -718,148 +785,172 @@ def format_auth_help(auth_plugins_mapping):
     3xx (Redirect) and --follow hasn't been set, then the exit status is 3.
     Also an error message is written to stderr if stdout is redirected.
 
-    '''
+    """,
 )
 network.add_argument(
     '--path-as-is',
     default=False,
     action='store_true',
-    help='''
-    Bypass dot segment (/../ or /./) URL squashing.
-
-    '''
+    short_help='Bypass dot segment (/../ or /./) URL squashing.'
 )
-
 network.add_argument(
     '--chunked',
     default=False,
     action='store_true',
-    help='''
-    Enable streaming via chunked transfer encoding.
-    The Transfer-Encoding header is set to chunked.
-
-    '''
+    short_help=(
+        'Enable streaming via chunked transfer encoding. '
+        'The Transfer-Encoding header is set to chunked.'
+    )
 )
 
 #######################################################################
 # SSL
 #######################################################################
 
-ssl = parser.add_argument_group(title='SSL')
+ssl = options.add_group('SSL')
+
 ssl.add_argument(
     '--verify',
     default='yes',
-    help='''
+    short_help='If "no", skip SSL verification. If a file path, use it as a CA bundle.',
+    help="""
     Set to "no" (or "false") to skip checking the host's SSL certificate.
     Defaults to "yes" ("true"). You can also pass the path to a CA_BUNDLE file
     for private certs. (Or you can set the REQUESTS_CA_BUNDLE environment
     variable instead.)
-    '''
+    """,
 )
 ssl.add_argument(
     '--ssl',
     dest='ssl_version',
     choices=sorted(AVAILABLE_SSL_VERSION_ARG_MAPPING.keys()),
-    help='''
+    short_help='The desired protocol version to used.',
+    help="""
     The desired protocol version to use. This will default to
     SSL v2.3 which will negotiate the highest protocol that both
     the server and your installation of OpenSSL support. Available protocols
     may vary depending on OpenSSL installation (only the supported ones
     are shown here).
 
-    '''
+    """,
+)
+
+CIPHERS_CURRENT_DEFAULTS = (
+    """
+    See `http --help` for the default ciphers list on you system.
+
+    """
+    if IS_MAN_PAGE else
+    f"""
+    By default, the following ciphers are used on your system:
+
+    {DEFAULT_SSL_CIPHERS_STRING}
+
+    """
 )
 ssl.add_argument(
     '--ciphers',
-    help=f'''
+    short_help='A string in the OpenSSL cipher list format.',
+    help=f"""
 
-    A string in the OpenSSL cipher list format. By default, the following
-    is used:
+    A string in the OpenSSL cipher list format.
 
-    {DEFAULT_SSL_CIPHERS}
+    {CIPHERS_CURRENT_DEFAULTS}
 
-    '''
+    """
 )
 ssl.add_argument(
     '--cert',
     default=None,
     type=readable_file_arg,
-    help='''
+    short_help='Specifies a local cert to use as the client-side SSL certificate.',
+    help="""
     You can specify a local cert to use as client side SSL certificate.
     This file may either contain both private key and certificate or you may
     specify --cert-key separately.
 
-    '''
+    """,
 )
-
 ssl.add_argument(
     '--cert-key',
     default=None,
     type=readable_file_arg,
-    help='''
+    short_help='The private key to use with SSL. Only needed if --cert is given.',
+    help="""
     The private key to use with SSL. Only needed if --cert is given and the
     certificate file does not contain the private key.
 
-    '''
+    """,
+)
+
+ssl.add_argument(
+    '--cert-key-pass',
+    default=None,
+    type=SSLCredentials,
+    short_help='The passphrase to be used to with the given private key.',
+    help="""
+    The passphrase to be used to with the given private key. Only needed if --cert-key
+    is given and the key file requires a passphrase.
+    If not provided, you’ll be prompted interactively.
+    """
 )
 
 #######################################################################
 # Troubleshooting
 #######################################################################
 
-troubleshooting = parser.add_argument_group(title='Troubleshooting')
-
+troubleshooting = options.add_group('Troubleshooting')
 troubleshooting.add_argument(
-    '--ignore-stdin', '-I',
+    '--ignore-stdin',
+    '-I',
     action='store_true',
     default=False,
-    help='''
-    Do not attempt to read stdin.
-
-    '''
+    short_help='Do not attempt to read stdin'
 )
 troubleshooting.add_argument(
     '--help',
     action='help',
-    default=SUPPRESS,
-    help='''
-    Show this help message and exit.
-
-    '''
+    default=Qualifiers.SUPPRESS,
+    short_help='Show this help message and exit.',
+)
+troubleshooting.add_argument(
+    '--manual',
+    action='manual',
+    default=Qualifiers.SUPPRESS,
+    short_help='Show the full manual.',
 )
 troubleshooting.add_argument(
     '--version',
     action='version',
     version=__version__,
-    help='''
-    Show version and exit.
-
-    '''
+    short_help='Show version and exit.',
 )
 troubleshooting.add_argument(
     '--traceback',
     action='store_true',
     default=False,
-    help='''
-    Prints the exception traceback should one occur.
-
-    '''
+    short_help='Prints the exception traceback should one occur.',
 )
 troubleshooting.add_argument(
     '--default-scheme',
-    default="http",
-    help='''
-    The default scheme to use if not specified in the URL.
-
-    '''
+    default='http',
+    short_help='The default scheme to use if not specified in the URL.'
 )
 troubleshooting.add_argument(
     '--debug',
     action='store_true',
     default=False,
-    help='''
+    short_help='Print useful diagnostic information for bug reports.',
+    help="""
     Prints the exception traceback should one occur, as well as other
     information useful for debugging HTTPie itself and for reporting bugs.
 
-    '''
+    """,
 )
+
+#######################################################################
+# Finalization
+#######################################################################
+
+options.finalize()
+parser = to_argparse(options)
diff --git a/httpie/cli/dicts.py b/httpie/cli/dicts.py
index 3d0cab5a45..6b6d4736d2 100644
--- a/httpie/cli/dicts.py
+++ b/httpie/cli/dicts.py
@@ -35,6 +35,16 @@ def add(self, key, value):
 
         super().add(key, value)
 
+    def remove_item(self, key, value):
+        """
+        Remove a (key, value) pair from the dict.
+        """
+        existing_values = self.popall(key)
+        existing_values.remove(value)
+
+        for value in existing_values:
+            self.add(key, value)
+
 
 class RequestJSONDataDict(OrderedDict):
     pass
diff --git a/httpie/cli/nested_json.py b/httpie/cli/nested_json.py
deleted file mode 100644
index 501e3b594f..0000000000
--- a/httpie/cli/nested_json.py
+++ /dev/null
@@ -1,344 +0,0 @@
-from enum import Enum, auto
-from typing import (
-    Any,
-    Iterator,
-    NamedTuple,
-    Optional,
-    List,
-    NoReturn,
-    Type,
-    Union,
-)
-from httpie.cli.constants import OPEN_BRACKET, CLOSE_BRACKET, BACKSLASH, HIGHLIGHTER
-
-
-class HTTPieSyntaxError(ValueError):
-    def __init__(
-        self,
-        source: str,
-        token: Optional['Token'],
-        message: str,
-        message_kind: str = 'Syntax',
-    ) -> None:
-        self.source = source
-        self.token = token
-        self.message = message
-        self.message_kind = message_kind
-
-    def __str__(self):
-        lines = [f'HTTPie {self.message_kind} Error: {self.message}']
-        if self.token is not None:
-            lines.append(self.source)
-            lines.append(
-                ' ' * (self.token.start)
-                + HIGHLIGHTER * (self.token.end - self.token.start)
-            )
-        return '\n'.join(lines)
-
-
-class TokenKind(Enum):
-    TEXT = auto()
-    NUMBER = auto()
-    LEFT_BRACKET = auto()
-    RIGHT_BRACKET = auto()
-
-    def to_name(self) -> str:
-        for key, value in OPERATORS.items():
-            if value is self:
-                return repr(key)
-        else:
-            return 'a ' + self.name.lower()
-
-
-OPERATORS = {OPEN_BRACKET: TokenKind.LEFT_BRACKET, CLOSE_BRACKET: TokenKind.RIGHT_BRACKET}
-SPECIAL_CHARS = OPERATORS.keys() | {BACKSLASH}
-
-
-class Token(NamedTuple):
-    kind: TokenKind
-    value: Union[str, int]
-    start: int
-    end: int
-
-
-def assert_cant_happen() -> NoReturn:
-    raise ValueError('Unexpected value')
-
-
-def check_escaped_int(value: str) -> str:
-    if not value.startswith(BACKSLASH):
-        raise ValueError('Not an escaped int')
-
-    try:
-        int(value[1:])
-    except ValueError as exc:
-        raise ValueError('Not an escaped int') from exc
-    else:
-        return value[1:]
-
-
-def tokenize(source: str) -> Iterator[Token]:
-    cursor = 0
-    backslashes = 0
-    buffer = []
-
-    def send_buffer() -> Iterator[Token]:
-        nonlocal backslashes
-        if not buffer:
-            return None
-
-        value = ''.join(buffer)
-        for variation, kind in [
-            (int, TokenKind.NUMBER),
-            (check_escaped_int, TokenKind.TEXT),
-        ]:
-            try:
-                value = variation(value)
-            except ValueError:
-                continue
-            else:
-                break
-        else:
-            kind = TokenKind.TEXT
-
-        yield Token(
-            kind, value, start=cursor - (len(buffer) + backslashes), end=cursor
-        )
-        buffer.clear()
-        backslashes = 0
-
-    def can_advance() -> bool:
-        return cursor < len(source)
-
-    while can_advance():
-        index = source[cursor]
-        if index in OPERATORS:
-            yield from send_buffer()
-            yield Token(OPERATORS[index], index, cursor, cursor + 1)
-        elif index == BACKSLASH and can_advance():
-            if source[cursor + 1] in SPECIAL_CHARS:
-                backslashes += 1
-            else:
-                buffer.append(index)
-
-            buffer.append(source[cursor + 1])
-            cursor += 1
-        else:
-            buffer.append(index)
-
-        cursor += 1
-
-    yield from send_buffer()
-
-
-class PathAction(Enum):
-    KEY = auto()
-    INDEX = auto()
-    APPEND = auto()
-
-    # Pseudo action, used by the interpreter
-    SET = auto()
-
-    def to_string(self) -> str:
-        return self.name.lower()
-
-
-class Path:
-    def __init__(
-        self,
-        kind: PathAction,
-        accessor: Optional[Union[str, int]] = None,
-        tokens: Optional[List[Token]] = None,
-        is_root: bool = False,
-    ):
-        self.kind = kind
-        self.accessor = accessor
-        self.tokens = tokens or []
-        self.is_root = is_root
-
-    def reconstruct(self) -> str:
-        if self.kind is PathAction.KEY:
-            if self.is_root:
-                return str(self.accessor)
-            return OPEN_BRACKET + self.accessor + CLOSE_BRACKET
-        elif self.kind is PathAction.INDEX:
-            return OPEN_BRACKET + str(self.accessor) + CLOSE_BRACKET
-        elif self.kind is PathAction.APPEND:
-            return OPEN_BRACKET + CLOSE_BRACKET
-        else:
-            assert_cant_happen()
-
-
-def parse(source: str) -> Iterator[Path]:
-    """
-    start: literal? path*
-
-    literal: TEXT | NUMBER
-
-    path:
-        key_path
-        | index_path
-        | append_path
-    key_path: LEFT_BRACKET TEXT RIGHT_BRACKET
-    index_path: LEFT_BRACKET NUMBER RIGHT_BRACKET
-    append_path: LEFT_BRACKET RIGHT_BRACKET
-    """
-
-    tokens = list(tokenize(source))
-    cursor = 0
-
-    def can_advance():
-        return cursor < len(tokens)
-
-    def expect(*kinds):
-        nonlocal cursor
-
-        assert len(kinds) > 0
-        if can_advance():
-            token = tokens[cursor]
-            cursor += 1
-            if token.kind in kinds:
-                return token
-        elif tokens:
-            token = tokens[-1]._replace(
-                start=tokens[-1].end + 0, end=tokens[-1].end + 1
-            )
-        else:
-            token = None
-
-        if len(kinds) == 1:
-            suffix = kinds[0].to_name()
-        else:
-            suffix = ', '.join(kind.to_name() for kind in kinds[:-1])
-            suffix += ' or ' + kinds[-1].to_name()
-
-        message = f'Expecting {suffix}'
-        raise HTTPieSyntaxError(source, token, message)
-
-    root = Path(PathAction.KEY, '', is_root=True)
-    if can_advance():
-        token = tokens[cursor]
-        if token.kind in {TokenKind.TEXT, TokenKind.NUMBER}:
-            token = expect(TokenKind.TEXT, TokenKind.NUMBER)
-            root.accessor = str(token.value)
-            root.tokens.append(token)
-
-    yield root
-
-    while can_advance():
-        path_tokens = []
-        path_tokens.append(expect(TokenKind.LEFT_BRACKET))
-
-        token = expect(
-            TokenKind.TEXT, TokenKind.NUMBER, TokenKind.RIGHT_BRACKET
-        )
-        path_tokens.append(token)
-        if token.kind is TokenKind.RIGHT_BRACKET:
-            path = Path(PathAction.APPEND, tokens=path_tokens)
-        elif token.kind is TokenKind.TEXT:
-            path = Path(PathAction.KEY, token.value, tokens=path_tokens)
-            path_tokens.append(expect(TokenKind.RIGHT_BRACKET))
-        elif token.kind is TokenKind.NUMBER:
-            path = Path(PathAction.INDEX, token.value, tokens=path_tokens)
-            path_tokens.append(expect(TokenKind.RIGHT_BRACKET))
-        else:
-            assert_cant_happen()
-        yield path
-
-
-JSON_TYPE_MAPPING = {
-    dict: 'object',
-    list: 'array',
-    int: 'number',
-    float: 'number',
-    str: 'string',
-}
-
-
-def interpret(context: Any, key: str, value: Any) -> Any:
-    cursor = context
-
-    paths = list(parse(key))
-    paths.append(Path(PathAction.SET, value))
-
-    def type_check(index: int, path: Path, expected_type: Type[Any]) -> None:
-        if not isinstance(cursor, expected_type):
-            if path.tokens:
-                pseudo_token = Token(
-                    None, None, path.tokens[0].start, path.tokens[-1].end
-                )
-            else:
-                pseudo_token = None
-
-            cursor_type = JSON_TYPE_MAPPING.get(
-                type(cursor), type(cursor).__name__
-            )
-            required_type = JSON_TYPE_MAPPING[expected_type]
-
-            message = f"Can't perform {path.kind.to_string()!r} based access on "
-            message += repr(
-                ''.join(path.reconstruct() for path in paths[:index])
-            )
-            message += (
-                f' which has a type of {cursor_type!r} but this operation'
-            )
-            message += f' requires a type of {required_type!r}.'
-            raise HTTPieSyntaxError(
-                key, pseudo_token, message, message_kind='Type'
-            )
-
-    def object_for(kind: str) -> Any:
-        if kind is PathAction.KEY:
-            return {}
-        elif kind in {PathAction.INDEX, PathAction.APPEND}:
-            return []
-        else:
-            assert_cant_happen()
-
-    for index, (path, next_path) in enumerate(zip(paths, paths[1:])):
-        if path.kind is PathAction.KEY:
-            type_check(index, path, dict)
-            if next_path.kind is PathAction.SET:
-                cursor[path.accessor] = next_path.accessor
-                break
-
-            cursor = cursor.setdefault(
-                path.accessor, object_for(next_path.kind)
-            )
-        elif path.kind is PathAction.INDEX:
-            type_check(index, path, list)
-            if path.accessor < 0:
-                raise HTTPieSyntaxError(
-                    key,
-                    path.tokens[1],
-                    'Negative indexes are not supported.',
-                    message_kind='Value',
-                )
-            cursor.extend([None] * (path.accessor - len(cursor) + 1))
-            if next_path.kind is PathAction.SET:
-                cursor[path.accessor] = next_path.accessor
-                break
-
-            if cursor[path.accessor] is None:
-                cursor[path.accessor] = object_for(next_path.kind)
-
-            cursor = cursor[path.accessor]
-        elif path.kind is PathAction.APPEND:
-            type_check(index, path, list)
-            if next_path.kind is PathAction.SET:
-                cursor.append(next_path.accessor)
-                break
-
-            cursor.append(object_for(next_path.kind))
-            cursor = cursor[-1]
-        else:
-            assert_cant_happen()
-
-    return context
-
-
-def interpret_nested_json(pairs):
-    context = {}
-    for key, value in pairs:
-        interpret(context, key, value)
-    return context
diff --git a/httpie/cli/nested_json/__init__.py b/httpie/cli/nested_json/__init__.py
new file mode 100644
index 0000000000..17b129abf3
--- /dev/null
+++ b/httpie/cli/nested_json/__init__.py
@@ -0,0 +1,20 @@
+"""
+A library for parsing the HTTPie nested JSON key syntax and constructing the resulting objects.
+
+<https://httpie.io/docs/cli/nested-json>
+
+It has no dependencies.
+
+"""
+from .interpret import interpret_nested_json, unwrap_top_level_list_if_needed
+from .errors import NestedJSONSyntaxError
+from .tokens import EMPTY_STRING, NestedJSONArray
+
+
+__all__ = [
+    'interpret_nested_json',
+    'unwrap_top_level_list_if_needed',
+    'EMPTY_STRING',
+    'NestedJSONArray',
+    'NestedJSONSyntaxError'
+]
diff --git a/httpie/cli/nested_json/errors.py b/httpie/cli/nested_json/errors.py
new file mode 100644
index 0000000000..f53f871566
--- /dev/null
+++ b/httpie/cli/nested_json/errors.py
@@ -0,0 +1,27 @@
+from typing import Optional
+
+from .tokens import Token, HIGHLIGHTER
+
+
+class NestedJSONSyntaxError(ValueError):
+    def __init__(
+        self,
+        source: str,
+        token: Optional[Token],
+        message: str,
+        message_kind: str = 'Syntax',
+    ) -> None:
+        self.source = source
+        self.token = token
+        self.message = message
+        self.message_kind = message_kind
+
+    def __str__(self):
+        lines = [f'HTTPie {self.message_kind} Error: {self.message}']
+        if self.token is not None:
+            lines.append(self.source)
+            lines.append(
+                ' ' * self.token.start
+                + HIGHLIGHTER * (self.token.end - self.token.start)
+            )
+        return '\n'.join(lines)
diff --git a/httpie/cli/nested_json/interpret.py b/httpie/cli/nested_json/interpret.py
new file mode 100644
index 0000000000..71fad98acd
--- /dev/null
+++ b/httpie/cli/nested_json/interpret.py
@@ -0,0 +1,129 @@
+from typing import Type, Union, Any, Iterable, Tuple
+
+from .parse import parse, assert_cant_happen
+from .errors import NestedJSONSyntaxError
+from .tokens import EMPTY_STRING, TokenKind, Token, PathAction, Path, NestedJSONArray
+
+
+__all__ = [
+    'interpret_nested_json',
+    'unwrap_top_level_list_if_needed',
+]
+
+JSONType = Type[Union[dict, list, int, float, str]]
+JSON_TYPE_MAPPING = {
+    dict: 'object',
+    list: 'array',
+    int: 'number',
+    float: 'number',
+    str: 'string',
+}
+
+
+def interpret_nested_json(pairs: Iterable[Tuple[str, str]]) -> dict:
+    context = None
+    for key, value in pairs:
+        context = interpret(context, key, value)
+    return wrap_with_dict(context)
+
+
+def interpret(context: Any, key: str, value: Any) -> Any:
+    cursor = context
+    paths = list(parse(key))
+    paths.append(Path(PathAction.SET, value))
+
+    # noinspection PyShadowingNames
+    def type_check(index: int, path: Path, expected_type: JSONType):
+        if not isinstance(cursor, expected_type):
+            if path.tokens:
+                pseudo_token = Token(
+                    kind=TokenKind.PSEUDO,
+                    value='',
+                    start=path.tokens[0].start,
+                    end=path.tokens[-1].end,
+                )
+            else:
+                pseudo_token = None
+            cursor_type = JSON_TYPE_MAPPING.get(type(cursor), type(cursor).__name__)
+            required_type = JSON_TYPE_MAPPING[expected_type]
+            message = f'Cannot perform {path.kind.to_string()!r} based access on '
+            message += repr(''.join(path.reconstruct() for path in paths[:index]))
+            message += f' which has a type of {cursor_type!r} but this operation'
+            message += f' requires a type of {required_type!r}.'
+            raise NestedJSONSyntaxError(
+                source=key,
+                token=pseudo_token,
+                message=message,
+                message_kind='Type',
+            )
+
+    def object_for(kind: PathAction) -> Any:
+        if kind is PathAction.KEY:
+            return {}
+        elif kind in {PathAction.INDEX, PathAction.APPEND}:
+            return []
+        else:
+            assert_cant_happen()
+
+    for index, (path, next_path) in enumerate(zip(paths, paths[1:])):
+        # If there is no context yet, set it.
+        if cursor is None:
+            context = cursor = object_for(path.kind)
+        if path.kind is PathAction.KEY:
+            type_check(index, path, dict)
+            if next_path.kind is PathAction.SET:
+                cursor[path.accessor] = next_path.accessor
+                break
+            cursor = cursor.setdefault(path.accessor, object_for(next_path.kind))
+        elif path.kind is PathAction.INDEX:
+            type_check(index, path, list)
+            if path.accessor < 0:
+                raise NestedJSONSyntaxError(
+                    source=key,
+                    token=path.tokens[1],
+                    message='Negative indexes are not supported.',
+                    message_kind='Value',
+                )
+            cursor.extend([None] * (path.accessor - len(cursor) + 1))
+            if next_path.kind is PathAction.SET:
+                cursor[path.accessor] = next_path.accessor
+                break
+            if cursor[path.accessor] is None:
+                cursor[path.accessor] = object_for(next_path.kind)
+            cursor = cursor[path.accessor]
+        elif path.kind is PathAction.APPEND:
+            type_check(index, path, list)
+            if next_path.kind is PathAction.SET:
+                cursor.append(next_path.accessor)
+                break
+            cursor.append(object_for(next_path.kind))
+            cursor = cursor[-1]
+        else:
+            assert_cant_happen()
+
+    return context
+
+
+def wrap_with_dict(context):
+    if context is None:
+        return {}
+    elif isinstance(context, list):
+        return {
+            EMPTY_STRING: NestedJSONArray(context),
+        }
+    else:
+        assert isinstance(context, dict)
+        return context
+
+
+def unwrap_top_level_list_if_needed(data: dict):
+    """
+    Propagate the top-level list, if that’s what we got.
+
+    """
+    if len(data) == 1:
+        key, value = list(data.items())[0]
+        if isinstance(value, NestedJSONArray):
+            assert key == EMPTY_STRING
+            return value
+    return data
diff --git a/httpie/cli/nested_json/parse.py b/httpie/cli/nested_json/parse.py
new file mode 100644
index 0000000000..323a22eef1
--- /dev/null
+++ b/httpie/cli/nested_json/parse.py
@@ -0,0 +1,193 @@
+from typing import Iterator
+
+from .errors import NestedJSONSyntaxError
+from .tokens import (
+    EMPTY_STRING,
+    BACKSLASH,
+    TokenKind,
+    OPERATORS,
+    SPECIAL_CHARS,
+    LITERAL_TOKENS,
+    Token,
+    PathAction,
+    Path,
+)
+
+
+__all__ = [
+    'parse',
+    'assert_cant_happen',
+]
+
+
+def parse(source: str) -> Iterator[Path]:
+    """
+    start: root_path path*
+    root_path: (literal | index_path | append_path)
+    literal: TEXT | NUMBER
+
+    path:
+        key_path
+        | index_path
+        | append_path
+    key_path: LEFT_BRACKET TEXT RIGHT_BRACKET
+    index_path: LEFT_BRACKET NUMBER RIGHT_BRACKET
+    append_path: LEFT_BRACKET RIGHT_BRACKET
+
+    """
+
+    tokens = list(tokenize(source))
+    cursor = 0
+
+    def can_advance():
+        return cursor < len(tokens)
+
+    # noinspection PyShadowingNames
+    def expect(*kinds):
+        nonlocal cursor
+        assert kinds
+        if can_advance():
+            token = tokens[cursor]
+            cursor += 1
+            if token.kind in kinds:
+                return token
+        elif tokens:
+            token = tokens[-1]._replace(
+                start=tokens[-1].end + 0,
+                end=tokens[-1].end + 1,
+            )
+        else:
+            token = None
+        if len(kinds) == 1:
+            suffix = kinds[0].to_name()
+        else:
+            suffix = ', '.join(kind.to_name() for kind in kinds[:-1])
+            suffix += ' or ' + kinds[-1].to_name()
+        message = f'Expecting {suffix}'
+        raise NestedJSONSyntaxError(source, token, message)
+
+    # noinspection PyShadowingNames
+    def parse_root():
+        tokens = []
+        if not can_advance():
+            return Path(
+                kind=PathAction.KEY,
+                accessor=EMPTY_STRING,
+                is_root=True
+            )
+        # (literal | index_path | append_path)?
+        token = expect(*LITERAL_TOKENS, TokenKind.LEFT_BRACKET)
+        tokens.append(token)
+        if token.kind in LITERAL_TOKENS:
+            action = PathAction.KEY
+            value = str(token.value)
+        elif token.kind is TokenKind.LEFT_BRACKET:
+            token = expect(TokenKind.NUMBER, TokenKind.RIGHT_BRACKET)
+            tokens.append(token)
+            if token.kind is TokenKind.NUMBER:
+                action = PathAction.INDEX
+                value = token.value
+                tokens.append(expect(TokenKind.RIGHT_BRACKET))
+            elif token.kind is TokenKind.RIGHT_BRACKET:
+                action = PathAction.APPEND
+                value = None
+            else:
+                assert_cant_happen()
+        else:
+            assert_cant_happen()
+        # noinspection PyUnboundLocalVariable
+        return Path(
+            kind=action,
+            accessor=value,
+            tokens=tokens,
+            is_root=True
+        )
+
+    yield parse_root()
+
+    # path*
+    while can_advance():
+        path_tokens = [expect(TokenKind.LEFT_BRACKET)]
+        token = expect(TokenKind.TEXT, TokenKind.NUMBER, TokenKind.RIGHT_BRACKET)
+        path_tokens.append(token)
+        if token.kind is TokenKind.RIGHT_BRACKET:
+            path = Path(PathAction.APPEND, tokens=path_tokens)
+        elif token.kind is TokenKind.TEXT:
+            path = Path(PathAction.KEY, token.value, tokens=path_tokens)
+            path_tokens.append(expect(TokenKind.RIGHT_BRACKET))
+        elif token.kind is TokenKind.NUMBER:
+            path = Path(PathAction.INDEX, token.value, tokens=path_tokens)
+            path_tokens.append(expect(TokenKind.RIGHT_BRACKET))
+        else:
+            assert_cant_happen()
+        # noinspection PyUnboundLocalVariable
+        yield path
+
+
+def tokenize(source: str) -> Iterator[Token]:
+    cursor = 0
+    backslashes = 0
+    buffer = []
+
+    def send_buffer() -> Iterator[Token]:
+        nonlocal backslashes
+        if not buffer:
+            return None
+
+        value = ''.join(buffer)
+        kind = TokenKind.TEXT
+        if not backslashes:
+            for variation, kind in [
+                (int, TokenKind.NUMBER),
+                (check_escaped_int, TokenKind.TEXT),
+            ]:
+                try:
+                    value = variation(value)
+                except ValueError:
+                    continue
+                else:
+                    break
+        yield Token(
+            kind=kind,
+            value=value,
+            start=cursor - (len(buffer) + backslashes),
+            end=cursor,
+        )
+        buffer.clear()
+        backslashes = 0
+
+    def can_advance() -> bool:
+        return cursor < len(source)
+
+    while can_advance():
+        index = source[cursor]
+        if index in OPERATORS:
+            yield from send_buffer()
+            yield Token(OPERATORS[index], index, cursor, cursor + 1)
+        elif index == BACKSLASH and can_advance():
+            if source[cursor + 1] in SPECIAL_CHARS:
+                backslashes += 1
+            else:
+                buffer.append(index)
+            buffer.append(source[cursor + 1])
+            cursor += 1
+        else:
+            buffer.append(index)
+        cursor += 1
+
+    yield from send_buffer()
+
+
+def check_escaped_int(value: str) -> str:
+    if not value.startswith(BACKSLASH):
+        raise ValueError('Not an escaped int')
+    try:
+        int(value[1:])
+    except ValueError as exc:
+        raise ValueError('Not an escaped int') from exc
+    else:
+        return value[1:]
+
+
+def assert_cant_happen():
+    raise ValueError('Unexpected value')
diff --git a/httpie/cli/nested_json/tokens.py b/httpie/cli/nested_json/tokens.py
new file mode 100644
index 0000000000..e8f3f4c12f
--- /dev/null
+++ b/httpie/cli/nested_json/tokens.py
@@ -0,0 +1,80 @@
+from enum import Enum, auto
+from typing import NamedTuple, Union, Optional, List
+
+EMPTY_STRING = ''
+HIGHLIGHTER = '^'
+OPEN_BRACKET = '['
+CLOSE_BRACKET = ']'
+BACKSLASH = '\\'
+
+
+class TokenKind(Enum):
+    TEXT = auto()
+    NUMBER = auto()
+    LEFT_BRACKET = auto()
+    RIGHT_BRACKET = auto()
+    PSEUDO = auto()  # Not a real token, use when representing location only.
+
+    def to_name(self) -> str:
+        for key, value in OPERATORS.items():
+            if value is self:
+                return repr(key)
+        else:
+            return 'a ' + self.name.lower()
+
+
+OPERATORS = {
+    OPEN_BRACKET: TokenKind.LEFT_BRACKET,
+    CLOSE_BRACKET: TokenKind.RIGHT_BRACKET,
+}
+SPECIAL_CHARS = OPERATORS.keys() | {BACKSLASH}
+LITERAL_TOKENS = [
+    TokenKind.TEXT,
+    TokenKind.NUMBER,
+]
+
+
+class Token(NamedTuple):
+    kind: TokenKind
+    value: Union[str, int]
+    start: int
+    end: int
+
+
+class PathAction(Enum):
+    KEY = auto()
+    INDEX = auto()
+    APPEND = auto()
+    # Pseudo action, used by the interpreter
+    SET = auto()
+
+    def to_string(self) -> str:
+        return self.name.lower()
+
+
+class Path:
+    def __init__(
+        self,
+        kind: PathAction,
+        accessor: Optional[Union[str, int]] = None,
+        tokens: Optional[List[Token]] = None,
+        is_root: bool = False,
+    ):
+        self.kind = kind
+        self.accessor = accessor
+        self.tokens = tokens or []
+        self.is_root = is_root
+
+    def reconstruct(self) -> str:
+        if self.kind is PathAction.KEY:
+            if self.is_root:
+                return str(self.accessor)
+            return OPEN_BRACKET + self.accessor + CLOSE_BRACKET
+        elif self.kind is PathAction.INDEX:
+            return OPEN_BRACKET + str(self.accessor) + CLOSE_BRACKET
+        elif self.kind is PathAction.APPEND:
+            return OPEN_BRACKET + CLOSE_BRACKET
+
+
+class NestedJSONArray(list):
+    """Denotes a top-level JSON array."""
diff --git a/httpie/cli/options.py b/httpie/cli/options.py
new file mode 100644
index 0000000000..c06a8ee615
--- /dev/null
+++ b/httpie/cli/options.py
@@ -0,0 +1,249 @@
+import argparse
+import textwrap
+import typing
+from dataclasses import dataclass, field
+from enum import Enum, auto
+from typing import Any, Optional, Dict, List, Tuple, Type, TypeVar
+
+from httpie.cli.argparser import HTTPieArgumentParser
+from httpie.cli.utils import Manual, LazyChoices
+
+
+class Qualifiers(Enum):
+    OPTIONAL = auto()
+    ZERO_OR_MORE = auto()
+    ONE_OR_MORE = auto()
+    SUPPRESS = auto()
+
+
+def map_qualifiers(
+    configuration: Dict[str, Any], qualifier_map: Dict[Qualifiers, Any]
+) -> Dict[str, Any]:
+    return {
+        key: qualifier_map[value] if isinstance(value, Qualifiers) else value
+        for key, value in configuration.items()
+    }
+
+
+def drop_keys(
+    configuration: Dict[str, Any], key_blacklist: Tuple[str, ...]
+):
+    return {
+        key: value
+        for key, value in configuration.items()
+        if key not in key_blacklist
+    }
+
+
+PARSER_SPEC_VERSION = '0.0.1a0'
+
+
+@dataclass
+class ParserSpec:
+    program: str
+    description: Optional[str] = None
+    epilog: Optional[str] = None
+    groups: List['Group'] = field(default_factory=list)
+    man_page_hint: Optional[str] = None
+    source_file: Optional[str] = None
+
+    def finalize(self) -> 'ParserSpec':
+        if self.description:
+            self.description = textwrap.dedent(self.description)
+        if self.epilog:
+            self.epilog = textwrap.dedent(self.epilog)
+        for group in self.groups:
+            group.finalize()
+        return self
+
+    def add_group(self, name: str, **kwargs) -> 'Group':
+        group = Group(name, **kwargs)
+        self.groups.append(group)
+        return group
+
+    def serialize(self) -> Dict[str, Any]:
+        return {
+            'name': self.program,
+            'description': self.description,
+            'groups': [group.serialize() for group in self.groups],
+        }
+
+
+@dataclass
+class Group:
+    name: str
+    description: str = ''
+    is_mutually_exclusive: bool = False
+    arguments: List['Argument'] = field(default_factory=list)
+
+    def finalize(self) -> None:
+        if self.description:
+            self.description = textwrap.dedent(self.description)
+
+    def add_argument(self, *args, **kwargs):
+        argument = Argument(list(args), kwargs.copy())
+        argument.post_init()
+        self.arguments.append(argument)
+        return argument
+
+    def serialize(self) -> Dict[str, Any]:
+        return {
+            'name': self.name,
+            'description': self.description or None,
+            'is_mutually_exclusive': self.is_mutually_exclusive,
+            'args': [argument.serialize() for argument in self.arguments],
+        }
+
+
+class Argument(typing.NamedTuple):
+    aliases: List[str]
+    configuration: Dict[str, Any]
+
+    def post_init(self):
+        """Run a bunch of post-init hooks."""
+        # If there is a short help, then create the longer version from it.
+        short_help = self.configuration.get('short_help')
+        if (
+            short_help
+            and 'help' not in self.configuration
+            and self.configuration.get('action') != 'lazy_choices'
+        ):
+            self.configuration['help'] = f'\n{short_help}\n\n'
+
+    def serialize(self, *, isolation_mode: bool = False) -> Dict[str, Any]:
+        configuration = self.configuration.copy()
+
+        # Unpack the dynamically computed choices, since we
+        # will need to store the actual values somewhere.
+        action = configuration.pop('action', None)
+        short_help = configuration.pop('short_help', None)
+        nested_options = configuration.pop('nested_options', None)
+
+        if action == 'lazy_choices':
+            choices = LazyChoices(
+                self.aliases,
+                **{'dest': None, **configuration},
+                isolation_mode=isolation_mode
+            )
+            configuration['choices'] = list(choices.load())
+            configuration['help'] = choices.help
+
+        result = {}
+        if self.aliases:
+            result['options'] = self.aliases.copy()
+        else:
+            result['options'] = [configuration['metavar']]
+            result['is_positional'] = True
+
+        qualifiers = JSON_QUALIFIER_TO_OPTIONS[configuration.get('nargs', Qualifiers.SUPPRESS)]
+        result.update(qualifiers)
+
+        description = configuration.get('help')
+        if description and description is not Qualifiers.SUPPRESS:
+            result['short_description'] = short_help
+            result['description'] = description
+
+        if nested_options:
+            result['nested_options'] = nested_options
+
+        python_type = configuration.get('type')
+        if python_type is not None:
+            if hasattr(python_type, '__name__'):
+                type_name = python_type.__name__
+            else:
+                type_name = type(python_type).__name__
+
+            result['python_type_name'] = type_name
+
+        result.update({
+            key: value
+            for key, value in configuration.items()
+            if key in JSON_DIRECT_MIRROR_OPTIONS
+            if value is not Qualifiers.SUPPRESS
+        })
+
+        return result
+
+    @property
+    def is_positional(self):
+        return len(self.aliases) == 0
+
+    @property
+    def is_hidden(self):
+        return self.configuration.get('help') is Qualifiers.SUPPRESS
+
+    def __getattr__(self, attribute_name):
+        if attribute_name in self.configuration:
+            return self.configuration[attribute_name]
+        else:
+            raise AttributeError(attribute_name)
+
+
+ParserType = TypeVar('ParserType', bound=Type[argparse.ArgumentParser])
+
+ARGPARSE_QUALIFIER_MAP = {
+    Qualifiers.OPTIONAL: argparse.OPTIONAL,
+    Qualifiers.SUPPRESS: argparse.SUPPRESS,
+    Qualifiers.ZERO_OR_MORE: argparse.ZERO_OR_MORE,
+    Qualifiers.ONE_OR_MORE: argparse.ONE_OR_MORE
+}
+ARGPARSE_IGNORE_KEYS = ('short_help', 'nested_options')
+
+
+def to_argparse(
+    abstract_options: ParserSpec,
+    parser_type: ParserType = HTTPieArgumentParser,
+) -> ParserType:
+    concrete_parser = parser_type(
+        prog=abstract_options.program,
+        description=abstract_options.description,
+        epilog=abstract_options.epilog,
+    )
+    concrete_parser.spec = abstract_options
+    concrete_parser.register('action', 'lazy_choices', LazyChoices)
+    concrete_parser.register('action', 'manual', Manual)
+
+    for abstract_group in abstract_options.groups:
+        concrete_group = concrete_parser.add_argument_group(
+            title=abstract_group.name, description=abstract_group.description
+        )
+        if abstract_group.is_mutually_exclusive:
+            concrete_group = concrete_group.add_mutually_exclusive_group(required=False)
+
+        for abstract_argument in abstract_group.arguments:
+            concrete_group.add_argument(
+                *abstract_argument.aliases,
+                **drop_keys(map_qualifiers(
+                    abstract_argument.configuration, ARGPARSE_QUALIFIER_MAP
+                ), ARGPARSE_IGNORE_KEYS)
+            )
+
+    return concrete_parser
+
+
+JSON_DIRECT_MIRROR_OPTIONS = (
+    'choices',
+    'metavar'
+)
+
+
+JSON_QUALIFIER_TO_OPTIONS = {
+    Qualifiers.OPTIONAL: {'is_optional': True},
+    Qualifiers.ZERO_OR_MORE: {'is_optional': True, 'is_variadic': True},
+    Qualifiers.ONE_OR_MORE: {'is_optional': False, 'is_variadic': True},
+    Qualifiers.SUPPRESS: {}
+}
+
+
+def to_data(abstract_options: ParserSpec) -> Dict[str, Any]:
+    return {'version': PARSER_SPEC_VERSION, 'spec': abstract_options.serialize()}
+
+
+def parser_to_parser_spec(parser: argparse.ArgumentParser, **kwargs) -> ParserSpec:
+    """Take an existing argparse parser, and create a spec from it."""
+    return ParserSpec(
+        program=parser.prog,
+        description=parser.description,
+        epilog=parser.epilog,
+        **kwargs
+    )
diff --git a/httpie/cli/requestitems.py b/httpie/cli/requestitems.py
index 96731b59a2..8931b88ac7 100644
--- a/httpie/cli/requestitems.py
+++ b/httpie/cli/requestitems.py
@@ -18,7 +18,7 @@
 )
 from .exceptions import ParseError
 from .nested_json import interpret_nested_json
-from ..utils import get_content_type, load_json_preserve_order_and_dupe_keys, split
+from ..utils import get_content_type, load_json_preserve_order_and_dupe_keys, split_iterable
 
 
 class RequestItems:
@@ -78,25 +78,28 @@ def from_args(
                 instance.data,
             ),
             SEPARATOR_DATA_RAW_JSON: (
-                json_only(instance, process_data_raw_json_embed_arg),
+                convert_json_value_to_form_if_needed(
+                    in_json_mode=instance.is_json,
+                    processor=process_data_raw_json_embed_arg
+                ),
                 instance.data,
             ),
             SEPARATOR_DATA_EMBED_RAW_JSON_FILE: (
-                json_only(instance, process_data_embed_raw_json_file_arg),
+                convert_json_value_to_form_if_needed(
+                    in_json_mode=instance.is_json,
+                    processor=process_data_embed_raw_json_file_arg,
+                ),
                 instance.data,
             ),
         }
 
         if instance.is_json:
-            json_item_args, request_item_args = split(
-                request_item_args,
-                lambda arg: arg.sep in SEPARATOR_GROUP_NESTED_JSON_ITEMS
+            json_item_args, request_item_args = split_iterable(
+                iterable=request_item_args,
+                key=lambda arg: arg.sep in SEPARATOR_GROUP_NESTED_JSON_ITEMS
             )
             if json_item_args:
-                pairs = [
-                    (arg.key, rules[arg.sep][0](arg))
-                    for arg in json_item_args
-                ]
+                pairs = [(arg.key, rules[arg.sep][0](arg)) for arg in json_item_args]
                 processor_func, target_dict = rules[SEPARATOR_GROUP_NESTED_JSON_ITEMS]
                 value = processor_func(pairs)
                 target_dict.update(value)
@@ -159,37 +162,38 @@ def process_file_upload_arg(arg: KeyValueArg) -> Tuple[str, IO, str]:
     )
 
 
-def process_data_item_arg(arg: KeyValueArg) -> str:
-    return arg.value
-
-
-def process_data_embed_file_contents_arg(arg: KeyValueArg) -> str:
-    return load_text_file(arg)
+def convert_json_value_to_form_if_needed(in_json_mode: bool, processor: Callable[[KeyValueArg], JSONType]) -> Callable[[], str]:
+    """
+    We allow primitive values to be passed to forms via JSON key/value syntax.
 
+    But complex values lead to an error because there’s no clear way to serialize them.
 
-def json_only(items: RequestItems, func: Callable[[KeyValueArg], JSONType]) -> str:
-    if items.is_json:
-        return func
+    """
+    if in_json_mode:
+        return processor
 
-    @functools.wraps(func)
+    @functools.wraps(processor)
     def wrapper(*args, **kwargs) -> str:
         try:
-            ret = func(*args, **kwargs)
+            output = processor(*args, **kwargs)
         except ParseError:
-            ret = None
-
-        # If it is a basic type, then allow it
-        if isinstance(ret, (str, int, float)):
-            return str(ret)
+            output = None
+        if isinstance(output, (str, int, float)):
+            return str(output)
         else:
-            raise ParseError(
-                'Can\'t use complex JSON value types with '
-                '--form/--multipart.'
-            )
+            raise ParseError('Cannot use complex JSON value types with --form/--multipart.')
 
     return wrapper
 
 
+def process_data_item_arg(arg: KeyValueArg) -> str:
+    return arg.value
+
+
+def process_data_embed_file_contents_arg(arg: KeyValueArg) -> str:
+    return load_text_file(arg)
+
+
 def process_data_embed_raw_json_file_arg(arg: KeyValueArg) -> JSONType:
     contents = load_text_file(arg)
     value = load_json(arg, contents)
diff --git a/httpie/cli/utils.py b/httpie/cli/utils.py
index b2ffabdcaa..ad27da37f7 100644
--- a/httpie/cli/utils.py
+++ b/httpie/cli/utils.py
@@ -4,20 +4,43 @@
 T = TypeVar('T')
 
 
+class Manual(argparse.Action):
+    def __init__(
+        self,
+        option_strings,
+        dest=argparse.SUPPRESS,
+        default=argparse.SUPPRESS,
+        help=None
+    ):
+        super().__init__(
+            option_strings=option_strings,
+            dest=dest,
+            default=default,
+            nargs=0,
+            help=help
+        )
+
+    def __call__(self, parser, namespace, values, option_string=None):
+        parser.print_manual()
+        parser.exit()
+
+
 class LazyChoices(argparse.Action, Generic[T]):
     def __init__(
         self,
         *args,
         getter: Callable[[], Iterable[T]],
-        help_formatter: Optional[Callable[[T], str]] = None,
+        help_formatter: Optional[Callable[[T, bool], str]] = None,
         sort: bool = False,
         cache: bool = True,
+        isolation_mode: bool = False,
         **kwargs
     ) -> None:
         self.getter = getter
         self.help_formatter = help_formatter
         self.sort = sort
         self.cache = cache
+        self.isolation_mode = isolation_mode
         self._help: Optional[str] = None
         self._obj: Optional[Iterable[T]] = None
         super().__init__(*args, **kwargs)
@@ -33,7 +56,10 @@ def load(self) -> T:
     @property
     def help(self) -> str:
         if self._help is None and self.help_formatter is not None:
-            self._help = self.help_formatter(self.load())
+            self._help = self.help_formatter(
+                self.load(),
+                isolation_mode=self.isolation_mode
+            )
         return self._help
 
     @help.setter
diff --git a/httpie/client.py b/httpie/client.py
index c2563cbc3e..a1da284a7c 100644
--- a/httpie/client.py
+++ b/httpie/client.py
@@ -10,15 +10,19 @@
 import requests
 # noinspection PyPackageRequirements
 import urllib3
+from urllib3.util import SKIP_HEADER, SKIPPABLE_HEADERS
+
 from . import __version__
 from .adapters import HTTPieHTTPAdapter
-from .context import Environment
+from .cli.constants import HTTP_OPTIONS
 from .cli.dicts import HTTPHeadersDict
+from .cli.nested_json import unwrap_top_level_list_if_needed
+from .context import Environment
 from .encoding import UTF8
 from .models import RequestsMessage
 from .plugins.registry import plugin_manager
 from .sessions import get_httpie_session
-from .ssl_ import AVAILABLE_SSL_VERSION_ARG_MAPPING, HTTPieHTTPSAdapter
+from .ssl_ import AVAILABLE_SSL_VERSION_ARG_MAPPING, HTTPieCertificate, HTTPieHTTPSAdapter
 from .uploads import (
     compress_request, prepare_request_body,
     get_multipart_data_and_content_type,
@@ -33,6 +37,8 @@
 JSON_ACCEPT = f'{JSON_CONTENT_TYPE}, */*;q=0.5'
 DEFAULT_UA = f'HTTPie/{__version__}'
 
+IGNORE_CONTENT_LENGTH_METHODS = frozenset([HTTP_OPTIONS])
+
 
 def collect_messages(
     env: Environment,
@@ -43,6 +49,7 @@ def collect_messages(
     httpie_session_headers = None
     if args.session or args.session_read_only:
         httpie_session = get_httpie_session(
+            env=env,
             config_dir=env.config.directory,
             session_name=args.session or args.session_read_only,
             host=args.headers.get('Host'),
@@ -83,7 +90,7 @@ def collect_messages(
 
     request = requests.Request(**request_kwargs)
     prepared_request = requests_session.prepare_request(request)
-    apply_missing_repeated_headers(prepared_request, request.headers)
+    transform_headers(request, prepared_request)
     if args.path_as_is:
         prepared_request.url = ensure_path_as_is(
             orig_url=args.url,
@@ -129,17 +136,14 @@ def collect_messages(
     if httpie_session:
         if httpie_session.is_new() or not args.session_read_only:
             httpie_session.cookies = requests_session.cookies
-            httpie_session.remove_cookies(
-                # TODO: take path & domain into account?
-                cookie['name'] for cookie in expired_cookies
-            )
+            httpie_session.remove_cookies(expired_cookies)
             httpie_session.save()
 
 
 # noinspection PyProtectedMember
 @contextmanager
 def max_headers(limit):
-    # <https://github.com/httpie/httpie/issues/802>
+    # <https://github.com/httpie/cli/issues/802>
     # noinspection PyUnresolvedReferences
     orig = http.client._MAXHEADERS
     http.client._MAXHEADERS = limit or float('Inf')
@@ -195,15 +199,40 @@ def finalize_headers(headers: HTTPHeadersDict) -> HTTPHeadersDict:
             # Also, requests raises `InvalidHeader` for leading spaces.
             value = value.strip()
             if isinstance(value, str):
-                # See <https://github.com/httpie/httpie/issues/212>
+                # See <https://github.com/httpie/cli/issues/212>
                 value = value.encode()
+        elif name.lower() in SKIPPABLE_HEADERS:
+            # Some headers get overwritten by urllib3 when set to `None`
+            # and should be replaced with the `SKIP_HEADER` constant.
+            value = SKIP_HEADER
         final_headers.add(name, value)
     return final_headers
 
 
+def transform_headers(
+    request: requests.Request,
+    prepared_request: requests.PreparedRequest
+) -> None:
+    """Apply various transformations on top of the `prepared_requests`'s
+    headers to change the request prepreation behavior."""
+
+    # Remove 'Content-Length' when it is misplaced by requests.
+    if (
+        prepared_request.method in IGNORE_CONTENT_LENGTH_METHODS
+        and prepared_request.headers.get('Content-Length') == '0'
+        and request.headers.get('Content-Length') != '0'
+    ):
+        prepared_request.headers.pop('Content-Length')
+
+    apply_missing_repeated_headers(
+        request.headers,
+        prepared_request
+    )
+
+
 def apply_missing_repeated_headers(
-    prepared_request: requests.PreparedRequest,
-    original_headers: HTTPHeadersDict
+    original_headers: HTTPHeadersDict,
+    prepared_request: requests.PreparedRequest
 ) -> None:
     """Update the given `prepared_request`'s headers with the original
     ones. This allows the requests to be prepared as usual, and then later
@@ -261,7 +290,14 @@ def make_send_kwargs_mergeable_from_env(args: argparse.Namespace) -> dict:
     if args.cert:
         cert = args.cert
         if args.cert_key:
-            cert = cert, args.cert_key
+            # Having a client certificate key passphrase is not supported
+            # by requests. So we are using our own transportation structure
+            # which is compatible with their format (a tuple of minimum two
+            # items).
+            #
+            # See: https://github.com/psf/requests/issues/2519
+            cert = HTTPieCertificate(cert, args.cert_key, args.cert_key_pass.value)
+
     return {
         'proxies': {p.key: p.value for p in args.proxy},
         'stream': True,
@@ -276,20 +312,13 @@ def make_send_kwargs_mergeable_from_env(args: argparse.Namespace) -> dict:
 
 
 def json_dict_to_request_body(data: Dict[str, Any]) -> str:
-    # Propagate the top-level list if there is only one
-    # item in the object, with an en empty key.
-    if len(data) == 1:
-        [(key, value)] = data.items()
-        if key == '' and isinstance(value, list):
-            data = value
-
+    data = unwrap_top_level_list_if_needed(data)
     if data:
         data = json.dumps(data)
     else:
         # We need to set data to an empty string to prevent requests
         # from assigning an empty list to `response.request.data`.
         data = ''
-
     return data
 
 
@@ -352,7 +381,7 @@ def ensure_path_as_is(orig_url: str, prepped_url: str) -> str:
     untouched because other (welcome) processing on the URL might have
     taken place.
 
-    <https://github.com/httpie/httpie/issues/895>
+    <https://github.com/httpie/cli/issues/895>
 
 
     <https://ec.haxx.se/http/http-basics#path-as-is>
diff --git a/httpie/compat.py b/httpie/compat.py
index 3b89f8ca4d..d12abcff02 100644
--- a/httpie/compat.py
+++ b/httpie/compat.py
@@ -1,9 +1,21 @@
 import sys
+from ssl import SSLContext
 from typing import Any, Optional, Iterable
 
+from httpie.cookies import HTTPieCookiePolicy
+from http import cookiejar  # noqa
+
+
+# Request does not carry the original policy attached to the
+# cookie jar, so until it is resolved we change the global cookie
+# policy. <https://github.com/psf/requests/issues/5449>
+cookiejar.DefaultCookiePolicy = HTTPieCookiePolicy
 
 is_windows = 'win32' in str(sys.platform).lower()
+is_frozen = getattr(sys, 'frozen', False)
 
+MIN_SUPPORTED_PY_VERSION = (3, 7)
+MAX_SUPPORTED_PY_VERSION = (3, 11)
 
 try:
     from functools import cached_property
@@ -54,7 +66,6 @@ def __get__(self, instance, cls=None):
             res = instance.__dict__[self.name] = self.func(instance)
             return res
 
-
 # importlib_metadata was a provisional module, so the APIs changed quite a few times
 # between 3.8-3.10. It was also not included in the standard library until 3.8, so
 # we install the backport for <3.8.
@@ -88,3 +99,15 @@ def get_dist_name(entry_point: importlib_metadata.EntryPoint) -> Optional[str]:
         return None
     else:
         return metadata.get('name')
+
+
+def ensure_default_certs_loaded(ssl_context: SSLContext) -> None:
+    """
+    Workaround for a bug in Requests 2.32.3
+
+    See <https://github.com/httpie/cli/issues/1583>
+
+    """
+    if hasattr(ssl_context, 'load_default_certs'):
+        if not ssl_context.get_ca_certs():
+            ssl_context.load_default_certs()
diff --git a/httpie/config.py b/httpie/config.py
index 28574e4ae7..27bc0a784d 100644
--- a/httpie/config.py
+++ b/httpie/config.py
@@ -1,7 +1,7 @@
 import json
 import os
 from pathlib import Path
-from typing import Union
+from typing import Any, Dict, Union
 
 from . import __version__
 from .compat import is_windows
@@ -62,6 +62,21 @@ class ConfigFileError(Exception):
     pass
 
 
+def read_raw_config(config_type: str, path: Path) -> Dict[str, Any]:
+    try:
+        with path.open(encoding=UTF8) as f:
+            try:
+                return json.load(f)
+            except ValueError as e:
+                raise ConfigFileError(
+                    f'invalid {config_type} file: {e} [{path}]'
+                )
+    except FileNotFoundError:
+        pass
+    except OSError as e:
+        raise ConfigFileError(f'cannot read {config_type} file: {e}')
+
+
 class BaseConfigDict(dict):
     name = None
     helpurl = None
@@ -77,26 +92,25 @@ def ensure_directory(self):
     def is_new(self) -> bool:
         return not self.path.exists()
 
+    def pre_process_data(self, data: Dict[str, Any]) -> Dict[str, Any]:
+        """Hook for processing the incoming config data."""
+        return data
+
+    def post_process_data(self, data: Dict[str, Any]) -> Dict[str, Any]:
+        """Hook for processing the outgoing config data."""
+        return data
+
     def load(self):
         config_type = type(self).__name__.lower()
-        try:
-            with self.path.open(encoding=UTF8) as f:
-                try:
-                    data = json.load(f)
-                except ValueError as e:
-                    raise ConfigFileError(
-                        f'invalid {config_type} file: {e} [{self.path}]'
-                    )
-                self.update(data)
-        except FileNotFoundError:
-            pass
-        except OSError as e:
-            raise ConfigFileError(f'cannot read {config_type} file: {e}')
-
-    def save(self):
-        self['__meta__'] = {
-            'httpie': __version__
-        }
+        data = read_raw_config(config_type, self.path)
+        if data is not None:
+            data = self.pre_process_data(data)
+            self.update(data)
+
+    def save(self, *, bump_version: bool = False):
+        self.setdefault('__meta__', {})
+        if bump_version or 'httpie' not in self['__meta__']:
+            self['__meta__']['httpie'] = __version__
         if self.helpurl:
             self['__meta__']['help'] = self.helpurl
 
@@ -106,13 +120,19 @@ def save(self):
         self.ensure_directory()
 
         json_string = json.dumps(
-            obj=self,
+            obj=self.post_process_data(self),
             indent=4,
             sort_keys=True,
             ensure_ascii=True,
         )
         self.path.write_text(json_string + '\n', encoding=UTF8)
 
+    @property
+    def version(self):
+        return self.get(
+            '__meta__', {}
+        ).get('httpie', __version__)
+
 
 class Config(BaseConfigDict):
     FILENAME = 'config.json'
@@ -129,6 +149,24 @@ def __init__(self, directory: Union[str, Path] = DEFAULT_CONFIG_DIR):
     def default_options(self) -> list:
         return self['default_options']
 
+    def _configured_path(self, config_option: str, default: str) -> None:
+        return Path(
+            self.get(config_option, self.directory / default)
+        ).expanduser().resolve()
+
     @property
     def plugins_dir(self) -> Path:
-        return Path(self.get('plugins_dir', self.directory / 'plugins')).resolve()
+        return self._configured_path('plugins_dir', 'plugins')
+
+    @property
+    def version_info_file(self) -> Path:
+        return self._configured_path('version_info_file', 'version_info.json')
+
+    @property
+    def developer_mode(self) -> bool:
+        """This is a special setting for the development environment. It is
+        different from the --debug mode in the terms that it might change
+        the behavior for certain parameters (e.g updater system) that
+        we usually ignore."""
+
+        return self.get('developer_mode')
diff --git a/httpie/context.py b/httpie/context.py
index 7a6e6a865c..2a54f46916 100644
--- a/httpie/context.py
+++ b/httpie/context.py
@@ -1,8 +1,11 @@
+import argparse
 import sys
 import os
+import warnings
 from contextlib import contextmanager
 from pathlib import Path
-from typing import Iterator, IO, Optional
+from typing import Iterator, IO, Optional, TYPE_CHECKING
+from enum import Enum
 
 
 try:
@@ -10,11 +13,34 @@
 except ImportError:
     curses = None  # Compiled w/o curses
 
-from .compat import is_windows
+from .compat import is_windows, cached_property
 from .config import DEFAULT_CONFIG_DIR, Config, ConfigFileError
 from .encoding import UTF8
 
 from .utils import repr_dict
+from .output.ui.palette import GenericColor
+
+if TYPE_CHECKING:
+    from rich.console import Console
+
+
+class LogLevel(str, Enum):
+    INFO = 'info'
+    WARNING = 'warning'
+    ERROR = 'error'
+
+
+LOG_LEVEL_COLORS = {
+    LogLevel.INFO: GenericColor.PINK,
+    LogLevel.WARNING: GenericColor.ORANGE,
+    LogLevel.ERROR: GenericColor.RED,
+}
+
+LOG_LEVEL_DISPLAY_THRESHOLDS = {
+    LogLevel.INFO: 1,
+    LogLevel.WARNING: 2,
+    LogLevel.ERROR: float('inf'),  # Never hide errors.
+}
 
 
 class Environment:
@@ -27,6 +53,7 @@ class Environment:
     is used by the test suite to simulate various scenarios.
 
     """
+    args = argparse.Namespace()
     is_windows: bool = is_windows
     config_dir: Path = DEFAULT_CONFIG_DIR
     stdin: Optional[IO] = sys.stdin  # `None` when closed fd (#791)
@@ -39,6 +66,10 @@ class Environment:
     stderr_isatty: bool = stderr.isatty()
     colors = 256
     program_name: str = 'http'
+
+    # Whether to show progress bars / status spinners etc.
+    show_displays: bool = True
+
     if not is_windows:
         if curses:
             try:
@@ -87,6 +118,8 @@ def __init__(self, devnull=None, **kwargs):
             self.stdout_encoding = getattr(
                 actual_stdout, 'encoding', None) or UTF8
 
+        self.quiet = kwargs.pop('quiet', 0)
+
     def __str__(self):
         defaults = dict(type(self).__dict__)
         actual = dict(defaults)
@@ -112,7 +145,7 @@ def config(self) -> Config:
                 try:
                     config.load()
                 except ConfigFileError as e:
-                    self.log_error(e, level='warning')
+                    self.log_error(e, level=LogLevel.WARNING)
         return config
 
     @property
@@ -134,6 +167,51 @@ def as_silent(self) -> Iterator[None]:
             self.stdout = original_stdout
             self.stderr = original_stderr
 
-    def log_error(self, msg, level='error'):
-        assert level in ['error', 'warning']
-        self._orig_stderr.write(f'\n{self.program_name}: {level}: {msg}\n\n')
+    def log_error(self, msg: str, level: LogLevel = LogLevel.ERROR) -> None:
+        if self.stdout_isatty and self.quiet >= LOG_LEVEL_DISPLAY_THRESHOLDS[level]:
+            stderr = self.stderr  # Not directly /dev/null, since stderr might be mocked
+        else:
+            stderr = self._orig_stderr
+        rich_console = self._make_rich_console(file=stderr, force_terminal=stderr.isatty())
+        rich_console.print(
+            f'\n{self.program_name}: {level.value}: {msg}\n\n',
+            style=LOG_LEVEL_COLORS[level],
+            markup=False,
+            highlight=False,
+            soft_wrap=True
+        )
+
+    def apply_warnings_filter(self) -> None:
+        if self.quiet >= LOG_LEVEL_DISPLAY_THRESHOLDS[LogLevel.WARNING]:
+            warnings.simplefilter("ignore")
+
+    def _make_rich_console(
+        self,
+        file: IO[str],
+        force_terminal: bool
+    ) -> 'Console':
+        from rich.console import Console
+        from httpie.output.ui.rich_palette import _make_rich_color_theme
+
+        style = getattr(self.args, 'style', None)
+        theme = _make_rich_color_theme(style)
+        # Rich infers the rest of the knowledge (e.g encoding)
+        # dynamically by looking at the file/stderr.
+        return Console(
+            file=file,
+            force_terminal=force_terminal,
+            no_color=(self.colors == 0),
+            theme=theme
+        )
+
+    # Rich recommends separating the actual console (stdout) from
+    # the error (stderr) console for better isolation between parts.
+    # https://rich.readthedocs.io/en/stable/console.html#error-console
+
+    @cached_property
+    def rich_console(self):
+        return self._make_rich_console(self.stdout, self.stdout_isatty)
+
+    @cached_property
+    def rich_error_console(self):
+        return self._make_rich_console(self.stderr, self.stderr_isatty)
diff --git a/httpie/cookies.py b/httpie/cookies.py
new file mode 100644
index 0000000000..3ec87ca124
--- /dev/null
+++ b/httpie/cookies.py
@@ -0,0 +1,25 @@
+from http import cookiejar
+
+
+_LOCALHOST = 'localhost'
+_LOCALHOST_SUFFIX = '.localhost'
+
+
+class HTTPieCookiePolicy(cookiejar.DefaultCookiePolicy):
+    def return_ok_secure(self, cookie, request):
+        """Check whether the given cookie is sent to a secure host."""
+
+        is_secure_protocol = super().return_ok_secure(cookie, request)
+        if is_secure_protocol:
+            return True
+
+        # The original implementation of this method only takes secure protocols
+        # (e.g., https) into account, but the latest developments in modern browsers
+        # (chrome, firefox) assume 'localhost' is also a secure location. So we
+        # override it with our own strategy.
+        return self._is_local_host(cookiejar.request_host(request))
+
+    def _is_local_host(self, hostname):
+        # Implements the static localhost detection algorithm in firefox.
+        # <https://searchfox.org/mozilla-central/rev/d4d7611ee4dd0003b492b865bc5988a4e6afc985/netwerk/dns/DNS.cpp#205-218>
+        return hostname == _LOCALHOST or hostname.endswith(_LOCALHOST_SUFFIX)
diff --git a/httpie/core.py b/httpie/core.py
index 079de17d28..d0c26dcbcc 100644
--- a/httpie/core.py
+++ b/httpie/core.py
@@ -11,18 +11,21 @@
 
 from . import __version__ as httpie_version
 from .cli.constants import OUT_REQ_BODY
-from .cli.nested_json import HTTPieSyntaxError
+from .cli.nested_json import NestedJSONSyntaxError
 from .client import collect_messages
-from .context import Environment
+from .context import Environment, LogLevel
 from .downloads import Downloader
 from .models import (
     RequestsMessageKind,
-    OutputOptions,
+    OutputOptions
 )
-from .output.writer import write_message, write_stream, MESSAGE_SEPARATOR_BYTES
+from .output.models import ProcessingOptions
+from .output.writer import write_message, write_stream, write_raw_data, MESSAGE_SEPARATOR_BYTES
 from .plugins.registry import plugin_manager
 from .status import ExitStatus, http_status_to_exit_status
 from .utils import unwrap_context
+from .internal.update_warnings import check_updates
+from .internal.daemon_runner import is_daemon_mode, run_daemon_task
 
 
 # noinspection PyDefaultArgument
@@ -36,6 +39,10 @@ def raw_main(
     program_name, *args = args
     env.program_name = os.path.basename(program_name)
     args = decode_raw_args(args, env.stdin_encoding)
+
+    if is_daemon_mode(args):
+        return run_daemon_task(env, args)
+
     plugin_manager.load_installed_plugins(env.config.plugins_dir)
 
     if use_default_options and env.config.default_options:
@@ -71,7 +78,7 @@ def handle_generic_error(e, annotation=None):
             args=args,
             env=env,
         )
-    except HTTPieSyntaxError as exc:
+    except NestedJSONSyntaxError as exc:
         env.stderr.write(str(exc) + "\n")
         if include_traceback:
             raise
@@ -88,6 +95,7 @@ def handle_generic_error(e, annotation=None):
                 raise
             exit_status = ExitStatus.ERROR
     else:
+        check_updates(env)
         try:
             exit_status = main_program(
                 args=parsed_args,
@@ -169,6 +177,7 @@ def program(args: argparse.Namespace, env: Environment) -> ExitStatus:
     downloader = None
     initial_request: Optional[requests.PreparedRequest] = None
     final_response: Optional[requests.Response] = None
+    processing_options = ProcessingOptions.from_raw_args(args)
 
     def separate():
         getattr(env.stdout, 'buffer', env.stdout).write(MESSAGE_SEPARATOR_BYTES)
@@ -183,17 +192,17 @@ def request_body_read_callback(chunk: bytes):
             and chunk
         )
         if should_pipe_to_stdout:
-            msg = requests.PreparedRequest()
-            msg.is_body_upload_chunk = True
-            msg.body = chunk
-            msg.headers = initial_request.headers
-            msg_output_options = OutputOptions.from_message(msg, body=True, headers=False)
-            write_message(requests_message=msg, env=env, args=args, output_options=msg_output_options)
+            return write_raw_data(
+                env,
+                chunk,
+                processing_options=processing_options,
+                headers=initial_request.headers
+            )
 
     try:
         if args.download:
             args.follow = True  # --download implies --follow.
-            downloader = Downloader(output_file=args.output_file, progress_file=env.stderr, resume=args.download_resume)
+            downloader = Downloader(env, output_file=args.output_file, resume=args.download_resume)
             downloader.pre_request(args.headers)
         messages = collect_messages(env, args=args,
                                     request_body_read_callback=request_body_read_callback)
@@ -221,10 +230,15 @@ def request_body_read_callback(chunk: bytes):
                 if args.check_status or downloader:
                     exit_status = http_status_to_exit_status(http_status=message.status_code, follow=args.follow)
                     if exit_status != ExitStatus.SUCCESS and (not env.stdout_isatty or args.quiet == 1):
-                        env.log_error(f'HTTP {message.raw.status} {message.raw.reason}', level='warning')
-            write_message(requests_message=message, env=env, args=args, output_options=output_options._replace(
-                body=do_write_body
-            ))
+                        env.log_error(f'HTTP {message.raw.status} {message.raw.reason}', level=LogLevel.WARNING)
+            write_message(
+                requests_message=message,
+                env=env,
+                output_options=output_options._replace(
+                    body=do_write_body
+                ),
+                processing_options=processing_options
+            )
             prev_with_body = output_options.body
 
         # Cleanup
diff --git a/httpie/downloads.py b/httpie/downloads.py
index 40c5271b03..9c4b895e6f 100644
--- a/httpie/downloads.py
+++ b/httpie/downloads.py
@@ -5,10 +5,8 @@
 import mimetypes
 import os
 import re
-import sys
-import threading
 from mailbox import Message
-from time import sleep, monotonic
+from time import monotonic
 from typing import IO, Optional, Tuple
 from urllib.parse import urlsplit
 
@@ -16,22 +14,11 @@
 
 from .models import HTTPResponse, OutputOptions
 from .output.streams import RawStream
-from .utils import humanize_bytes
+from .context import Environment
 
 
 PARTIAL_CONTENT = 206
 
-CLEAR_LINE = '\r\033[K'
-PROGRESS = (
-    '{percentage: 6.2f} %'
-    ' {downloaded: >10}'
-    ' {speed: >10}/s'
-    ' {eta: >8} ETA'
-)
-PROGRESS_NO_CONTENT_LENGTH = '{downloaded: >10} {speed: >10}/s'
-SUMMARY = 'Done. {downloaded} in {time:0.5f}s ({speed}/s)\n'
-SPINNER = '|/-\\'
-
 
 class ContentRangeError(ValueError):
     pass
@@ -176,9 +163,9 @@ class Downloader:
 
     def __init__(
         self,
+        env: Environment,
         output_file: IO = None,
-        resume: bool = False,
-        progress_file: IO = sys.stderr
+        resume: bool = False
     ):
         """
         :param resume: Should the download resume if partial download
@@ -191,14 +178,10 @@ def __init__(
 
         """
         self.finished = False
-        self.status = DownloadStatus()
+        self.status = DownloadStatus(env=env)
         self._output_file = output_file
         self._resume = resume
         self._resumed_from = 0
-        self._progress_reporter = ProgressReporterThread(
-            status=self.status,
-            output=progress_file
-        )
 
     def pre_request(self, request_headers: dict):
         """Called just before the HTTP request is sent.
@@ -234,7 +217,7 @@ def start(
         assert not self.status.time_started
 
         # FIXME: some servers still might sent Content-Encoding: gzip
-        # <https://github.com/httpie/httpie/issues/423>
+        # <https://github.com/httpie/cli/issues/423>
         try:
             total_size = int(final_response.headers['Content-Length'])
         except (KeyError, ValueError, TypeError):
@@ -261,11 +244,6 @@ def start(
                 except OSError:
                     pass  # stdout
 
-        self.status.started(
-            resumed_from=self._resumed_from,
-            total_size=total_size
-        )
-
         output_options = OutputOptions.from_message(final_response, headers=False, body=True)
         stream = RawStream(
             msg=HTTPResponse(final_response),
@@ -273,11 +251,11 @@ def start(
             on_body_chunk_downloaded=self.chunk_downloaded,
         )
 
-        self._progress_reporter.output.write(
-            f'Downloading {humanize_bytes(total_size) + " " if total_size is not None else ""}'
-            f'to "{self._output_file.name}"\n'
+        self.status.started(
+            output_file=self._output_file,
+            resumed_from=self._resumed_from,
+            total_size=total_size
         )
-        self._progress_reporter.start()
 
         return stream, self._output_file
 
@@ -287,7 +265,7 @@ def finish(self):
         self.status.finished()
 
     def failed(self):
-        self._progress_reporter.stop()
+        self.status.terminate()
 
     @property
     def interrupted(self) -> bool:
@@ -329,127 +307,71 @@ def _get_output_file_from_response(
 class DownloadStatus:
     """Holds details about the download status."""
 
-    def __init__(self):
+    def __init__(self, env):
+        self.env = env
         self.downloaded = 0
         self.total_size = None
         self.resumed_from = 0
         self.time_started = None
         self.time_finished = None
 
-    def started(self, resumed_from=0, total_size=None):
+    def started(self, output_file, resumed_from=0, total_size=None):
         assert self.time_started is None
         self.total_size = total_size
         self.downloaded = self.resumed_from = resumed_from
         self.time_started = monotonic()
+        self.start_display(output_file=output_file)
+
+    def start_display(self, output_file):
+        from httpie.output.ui.rich_progress import (
+            DummyDisplay,
+            StatusDisplay,
+            ProgressDisplay
+        )
+
+        message = f'Downloading to {output_file.name}'
+        if self.env.show_displays:
+            if self.total_size is None:
+                # Rich does not support progress bars without a total
+                # size given. Instead we use status objects.
+                self.display = StatusDisplay(self.env)
+            else:
+                self.display = ProgressDisplay(self.env)
+        else:
+            self.display = DummyDisplay(self.env)
+
+        self.display.start(
+            total=self.total_size,
+            at=self.downloaded,
+            description=message
+        )
 
     def chunk_downloaded(self, size):
         assert self.time_finished is None
         self.downloaded += size
+        self.display.update(size)
 
     @property
     def has_finished(self):
         return self.time_finished is not None
 
+    @property
+    def time_spent(self):
+        if (
+            self.time_started is not None
+            and self.time_finished is not None
+        ):
+            return self.time_finished - self.time_started
+        else:
+            return None
+
     def finished(self):
         assert self.time_started is not None
         assert self.time_finished is None
         self.time_finished = monotonic()
+        if hasattr(self, 'display'):
+            self.display.stop(self.time_spent)
 
-
-class ProgressReporterThread(threading.Thread):
-    """
-    Reports download progress based on its status.
-
-    Uses threading to periodically update the status (speed, ETA, etc.).
-
-    """
-
-    def __init__(
-        self,
-        status: DownloadStatus,
-        output: IO,
-        tick=.1,
-        update_interval=1
-    ):
-        super().__init__()
-        self.status = status
-        self.output = output
-        self._tick = tick
-        self._update_interval = update_interval
-        self._spinner_pos = 0
-        self._status_line = ''
-        self._prev_bytes = 0
-        self._prev_time = monotonic()
-        self._should_stop = threading.Event()
-
-    def stop(self):
-        """Stop reporting on next tick."""
-        self._should_stop.set()
-
-    def run(self):
-        while not self._should_stop.is_set():
-            if self.status.has_finished:
-                self.sum_up()
-                break
-
-            self.report_speed()
-            sleep(self._tick)
-
-    def report_speed(self):
-        now = monotonic()
-        if now - self._prev_time >= self._update_interval:
-            downloaded = self.status.downloaded
-            speed = ((downloaded - self._prev_bytes)
-                     / (now - self._prev_time))
-
-            if not self.status.total_size:
-                self._status_line = PROGRESS_NO_CONTENT_LENGTH.format(
-                    downloaded=humanize_bytes(downloaded),
-                    speed=humanize_bytes(speed),
-                )
-            else:
-                percentage = (downloaded / self.status.total_size * 100
-                              if self.status.total_size
-                              else 0)
-
-                if not speed:
-                    eta = '-:--:--'
-                else:
-                    s = int((self.status.total_size - downloaded) / speed)
-                    h, s = divmod(s, 60 * 60)
-                    m, s = divmod(s, 60)
-                    eta = f'{h}:{m:0>2}:{s:0>2}'
-
-                self._status_line = PROGRESS.format(
-                    percentage=percentage,
-                    downloaded=humanize_bytes(downloaded),
-                    speed=humanize_bytes(speed),
-                    eta=eta,
-                )
-
-            self._prev_time = now
-            self._prev_bytes = downloaded
-
-        self.output.write(
-            f'{CLEAR_LINE} {SPINNER[self._spinner_pos]} {self._status_line}'
-        )
-        self.output.flush()
-
-        self._spinner_pos = (self._spinner_pos + 1) % len(SPINNER)
-
-    def sum_up(self):
-        actually_downloaded = (
-            self.status.downloaded - self.status.resumed_from)
-        time_taken = self.status.time_finished - self.status.time_started
-        speed = actually_downloaded / time_taken if time_taken else actually_downloaded
-
-        self.output.write(CLEAR_LINE)
-
-        self.output.write(SUMMARY.format(
-            downloaded=humanize_bytes(actually_downloaded),
-            total=(self.status.total_size
-                   and humanize_bytes(self.status.total_size)),
-            speed=humanize_bytes(speed),
-            time=time_taken,
-        ))
-        self.output.flush()
+    def terminate(self):
+        if hasattr(self, 'display'):
+            self.display.stop(self.time_spent)
diff --git a/httpie/internal/__build_channel__.py b/httpie/internal/__build_channel__.py
new file mode 100644
index 0000000000..f56ce598f6
--- /dev/null
+++ b/httpie/internal/__build_channel__.py
@@ -0,0 +1,5 @@
+# Represents the packaging method. This file should
+# be overridden by every build system we support on
+# the packaging step.
+
+BUILD_CHANNEL = 'unknown'
diff --git a/httpie/internal/__init__.py b/httpie/internal/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/httpie/internal/daemon_runner.py b/httpie/internal/daemon_runner.py
new file mode 100644
index 0000000000..ec20b50cea
--- /dev/null
+++ b/httpie/internal/daemon_runner.py
@@ -0,0 +1,50 @@
+import argparse
+from contextlib import redirect_stderr, redirect_stdout
+from typing import List
+
+from httpie.context import Environment
+from httpie.internal.update_warnings import _fetch_updates, _get_suppress_context
+from httpie.status import ExitStatus
+
+STATUS_FILE = '.httpie-test-daemon-status'
+
+
+def _check_status(env):
+    # This function is used only for the testing (test_update_warnings).
+    # Since we don't want to trigger the fetch_updates (which would interact
+    # with real world resources), we'll only trigger this pseudo task
+    # and check whether the STATUS_FILE is created or not.
+    import tempfile
+    from pathlib import Path
+
+    status_file = Path(tempfile.gettempdir()) / STATUS_FILE
+    status_file.touch()
+
+
+DAEMONIZED_TASKS = {
+    'check_status': _check_status,
+    'fetch_updates': _fetch_updates,
+}
+
+
+def _parse_options(args: List[str]) -> argparse.Namespace:
+    parser = argparse.ArgumentParser()
+    parser.add_argument('task_id')
+    parser.add_argument('--daemon', action='store_true')
+    return parser.parse_known_args(args)[0]
+
+
+def is_daemon_mode(args: List[str]) -> bool:
+    return '--daemon' in args
+
+
+def run_daemon_task(env: Environment, args: List[str]) -> ExitStatus:
+    options = _parse_options(args)
+
+    assert options.daemon
+    assert options.task_id in DAEMONIZED_TASKS
+    with redirect_stdout(env.devnull), redirect_stderr(env.devnull):
+        with _get_suppress_context(env):
+            DAEMONIZED_TASKS[options.task_id](env)
+
+    return ExitStatus.SUCCESS
diff --git a/httpie/internal/daemons.py b/httpie/internal/daemons.py
new file mode 100644
index 0000000000..929f960ca0
--- /dev/null
+++ b/httpie/internal/daemons.py
@@ -0,0 +1,121 @@
+"""
+This module provides an interface to spawn a detached task to be
+run with httpie.internal.daemon_runner on a separate process. It is
+based on DVC's daemon system.
+https://github.com/iterative/dvc/blob/main/dvc/daemon.py
+"""
+
+import inspect
+import os
+import platform
+import sys
+import httpie.__main__
+from contextlib import suppress
+from subprocess import Popen, DEVNULL
+from typing import Dict, List
+from httpie.compat import is_frozen, is_windows
+
+
+ProcessContext = Dict[str, str]
+
+
+def _start_process(cmd: List[str], **kwargs) -> Popen:
+    prefix = [sys.executable]
+    # If it is frozen, sys.executable points to the binary (http).
+    # Otherwise it points to the python interpreter.
+    if not is_frozen:
+        main_entrypoint = httpie.__main__.__file__
+        prefix += [main_entrypoint]
+    return Popen(prefix + cmd, close_fds=True, shell=False, stdout=DEVNULL, stderr=DEVNULL, **kwargs)
+
+
+def _spawn_windows(cmd: List[str], process_context: ProcessContext) -> None:
+    from subprocess import (
+        CREATE_NEW_PROCESS_GROUP,
+        CREATE_NO_WINDOW,
+        STARTF_USESHOWWINDOW,
+        STARTUPINFO,
+    )
+
+    # https://stackoverflow.com/a/7006424
+    # https://bugs.python.org/issue41619
+    creationflags = CREATE_NEW_PROCESS_GROUP | CREATE_NO_WINDOW
+
+    startupinfo = STARTUPINFO()
+    startupinfo.dwFlags |= STARTF_USESHOWWINDOW
+
+    _start_process(
+        cmd,
+        env=process_context,
+        creationflags=creationflags,
+        startupinfo=startupinfo,
+    )
+
+
+def _spawn_posix(args: List[str], process_context: ProcessContext) -> None:
+    """
+    Perform a double fork procedure* to detach from the parent
+    process so that we don't block the user even if their original
+    command's execution is done but the release fetcher is not.
+
+    [1]: https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap11.html#tag_11_01_03
+    """
+
+    from httpie.core import main
+
+    try:
+        pid = os.fork()
+        if pid > 0:
+            return
+    except OSError:
+        os._exit(1)
+
+    os.setsid()
+
+    try:
+        pid = os.fork()
+        if pid > 0:
+            os._exit(0)
+    except OSError:
+        os._exit(1)
+
+    # Close all standard inputs/outputs
+    sys.stdin.close()
+    sys.stdout.close()
+    sys.stderr.close()
+
+    if platform.system() == 'Darwin':
+        # Double-fork is not reliable on MacOS, so we'll use a subprocess
+        # to ensure the task is isolated properly.
+        process = _start_process(args, env=process_context)
+        # Unlike windows, since we already completed the fork procedure
+        # we can simply join the process and wait for it.
+        process.communicate()
+    else:
+        os.environ.update(process_context)
+        with suppress(BaseException):
+            main(['http'] + args)
+
+    os._exit(0)
+
+
+def _spawn(args: List[str], process_context: ProcessContext) -> None:
+    """
+    Spawn a new process to run the given command.
+    """
+    if is_windows:
+        _spawn_windows(args, process_context)
+    else:
+        _spawn_posix(args, process_context)
+
+
+def spawn_daemon(task: str) -> None:
+    args = [task, '--daemon']
+    process_context = os.environ.copy()
+    if not is_frozen:
+        file_path = os.path.abspath(inspect.stack()[0][1])
+        process_context['PYTHONPATH'] = os.path.dirname(
+            os.path.dirname(os.path.dirname(file_path))
+        )
+
+    _spawn(args, process_context)
diff --git a/httpie/internal/update_warnings.py b/httpie/internal/update_warnings.py
new file mode 100644
index 0000000000..a4b80d46b5
--- /dev/null
+++ b/httpie/internal/update_warnings.py
@@ -0,0 +1,171 @@
+import json
+from contextlib import nullcontext, suppress
+from datetime import datetime, timedelta
+from pathlib import Path
+from typing import Any, Optional, Callable
+
+import requests
+
+import httpie
+from httpie.context import Environment, LogLevel
+from httpie.internal.__build_channel__ import BUILD_CHANNEL
+from httpie.internal.daemons import spawn_daemon
+from httpie.utils import is_version_greater, open_with_lockfile
+
+# Automatically updated package version index.
+PACKAGE_INDEX_LINK = 'https://packages.httpie.io/latest.json'
+
+FETCH_INTERVAL = timedelta(weeks=2)
+WARN_INTERVAL = timedelta(weeks=1)
+
+UPDATE_MESSAGE_FORMAT = """\
+A new HTTPie release ({last_released_version}) is available.
+To see how you can update, please visit https://httpie.io/docs/cli/{installation_method}
+"""
+
+ALREADY_UP_TO_DATE_MESSAGE = """\
+You are already up-to-date.
+"""
+
+
+def _read_data_error_free(file: Path) -> Any:
+    # If the file is broken / non-existent, ignore it.
+    try:
+        with open(file) as stream:
+            return json.load(stream)
+    except (ValueError, OSError):
+        return {}
+
+
+def _fetch_updates(env: Environment) -> str:
+    file = env.config.version_info_file
+    data = _read_data_error_free(file)
+
+    response = requests.get(PACKAGE_INDEX_LINK, verify=False)
+    response.raise_for_status()
+
+    data.setdefault('last_warned_date', None)
+    data['last_fetched_date'] = datetime.now().isoformat()
+    data['last_released_versions'] = response.json()
+
+    with open_with_lockfile(file, 'w') as stream:
+        json.dump(data, stream)
+
+
+def fetch_updates(env: Environment, lazy: bool = True):
+    if lazy:
+        spawn_daemon('fetch_updates')
+    else:
+        _fetch_updates(env)
+
+
+def maybe_fetch_updates(env: Environment) -> None:
+    if env.config.get('disable_update_warnings'):
+        return None
+
+    data = _read_data_error_free(env.config.version_info_file)
+
+    if data:
+        current_date = datetime.now()
+        last_fetched_date = datetime.fromisoformat(data['last_fetched_date'])
+        earliest_fetch_date = last_fetched_date + FETCH_INTERVAL
+        if current_date < earliest_fetch_date:
+            return None
+
+    fetch_updates(env)
+
+
+def _get_suppress_context(env: Environment) -> Any:
+    """Return a context manager that suppress
+    all possible errors.
+
+    Note: if you have set the developer_mode=True in
+    your config, then it will show all errors for easier
+    debugging."""
+    if env.config.developer_mode:
+        return nullcontext()
+    else:
+        return suppress(BaseException)
+
+
+def _update_checker(
+    func: Callable[[Environment], None]
+) -> Callable[[Environment], None]:
+    """Control the execution of the update checker (suppress errors, trigger
+    auto updates etc.)"""
+
+    def wrapper(env: Environment) -> None:
+        with _get_suppress_context(env):
+            func(env)
+
+        with _get_suppress_context(env):
+            maybe_fetch_updates(env)
+
+    return wrapper
+
+
+def _get_update_status(env: Environment) -> Optional[str]:
+    """If there is a new update available, return the warning text.
+    Otherwise just return None."""
+    file = env.config.version_info_file
+    if not file.exists():
+        return None
+
+    with _get_suppress_context(env):
+        # If the user quickly spawns multiple httpie processes
+        # we don't want to end in a race.
+        with open_with_lockfile(file) as stream:
+            version_info = json.load(stream)
+
+        available_channels = version_info['last_released_versions']
+        if BUILD_CHANNEL not in available_channels:
+            return None
+
+        current_version = httpie.__version__
+        last_released_version = available_channels[BUILD_CHANNEL]
+        if not is_version_greater(last_released_version, current_version):
+            return None
+
+        text = UPDATE_MESSAGE_FORMAT.format(
+            last_released_version=last_released_version,
+            installation_method=BUILD_CHANNEL,
+        )
+        return text
+
+
+def get_update_status(env: Environment) -> str:
+    return _get_update_status(env) or ALREADY_UP_TO_DATE_MESSAGE
+
+
+@_update_checker
+def check_updates(env: Environment) -> None:
+    if env.config.get('disable_update_warnings'):
+        return None
+
+    file = env.config.version_info_file
+    update_status = _get_update_status(env)
+
+    if not update_status:
+        return None
+
+    # If the user quickly spawns multiple httpie processes
+    # we don't want to end in a race.
+    with open_with_lockfile(file) as stream:
+        version_info = json.load(stream)
+
+    # We don't want to spam the user with too many warnings,
+    # so we'll only warn every once a while (WARN_INTERNAL).
+    current_date = datetime.now()
+    last_warned_date = version_info['last_warned_date']
+    if last_warned_date is not None:
+        earliest_warn_date = (
+            datetime.fromisoformat(last_warned_date) + WARN_INTERVAL
+        )
+        if current_date < earliest_warn_date:
+            return None
+
+    env.log_error(update_status, level=LogLevel.INFO)
+    version_info['last_warned_date'] = current_date.isoformat()
+
+    with open_with_lockfile(file, 'w') as stream:
+        json.dump(version_info, stream)
diff --git a/httpie/legacy/__init__.py b/httpie/legacy/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/httpie/legacy/v3_1_0_session_cookie_format.py b/httpie/legacy/v3_1_0_session_cookie_format.py
new file mode 100644
index 0000000000..32b7e51785
--- /dev/null
+++ b/httpie/legacy/v3_1_0_session_cookie_format.py
@@ -0,0 +1,100 @@
+import argparse
+from typing import Any, Type, List, Dict, TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from httpie.sessions import Session
+
+
+INSECURE_COOKIE_JAR_WARNING = '''\
+Outdated layout detected for the current session. Please consider updating it,
+in order to not get affected by potential security problems.
+
+For fixing the current session:
+
+    With binding all cookies to the current host (secure):
+        $ httpie cli sessions upgrade --bind-cookies {hostname} {session_id}
+
+    Without binding cookies (leaving them as is) (insecure):
+        $ httpie cli sessions upgrade {hostname} {session_id}
+'''
+
+
+INSECURE_COOKIE_JAR_WARNING_FOR_NAMED_SESSIONS = '''\
+
+For fixing all named sessions:
+
+    With binding all cookies to the current host (secure):
+        $ httpie cli sessions upgrade-all --bind-cookies
+
+    Without binding cookies (leaving them as is) (insecure):
+        $ httpie cli sessions upgrade-all
+'''
+
+INSECURE_COOKIE_SECURITY_LINK = '\nSee https://pie.co/docs/security for more information.'
+
+
+def pre_process(session: 'Session', cookies: Any) -> List[Dict[str, Any]]:
+    """Load the given cookies to the cookie jar while maintaining
+    support for the old cookie layout."""
+
+    is_old_style = isinstance(cookies, dict)
+    if is_old_style:
+        normalized_cookies = [
+            {
+                'name': key,
+                **value
+            }
+            for key, value in cookies.items()
+        ]
+    else:
+        normalized_cookies = cookies
+
+    should_issue_warning = is_old_style and any(
+        cookie.get('domain', '') == ''
+        for cookie in normalized_cookies
+    )
+
+    if should_issue_warning:
+        warning = INSECURE_COOKIE_JAR_WARNING.format(hostname=session.bound_host, session_id=session.session_id)
+        if not session.is_anonymous:
+            warning += INSECURE_COOKIE_JAR_WARNING_FOR_NAMED_SESSIONS
+        warning += INSECURE_COOKIE_SECURITY_LINK
+        session.warn_legacy_usage(warning)
+
+    return normalized_cookies
+
+
+def post_process(
+    normalized_cookies: List[Dict[str, Any]],
+    *,
+    original_type: Type[Any]
+) -> Any:
+    """Convert the cookies to their original format for
+    maximum compatibility."""
+
+    if issubclass(original_type, dict):
+        return {
+            cookie.pop('name'): cookie
+            for cookie in normalized_cookies
+        }
+    else:
+        return normalized_cookies
+
+
+def fix_layout(session: 'Session', hostname: str, args: argparse.Namespace) -> None:
+    if not isinstance(session['cookies'], dict):
+        return None
+
+    session['cookies'] = [
+        {
+            'name': key,
+            **value
+        }
+        for key, value in session['cookies'].items()
+    ]
+    for cookie in session.cookies:
+        if cookie.domain == '':
+            if args.bind_cookies:
+                cookie.domain = hostname
+            else:
+                cookie._rest['is_explicit_none'] = True
diff --git a/httpie/legacy/v3_2_0_session_header_format.py b/httpie/legacy/v3_2_0_session_header_format.py
new file mode 100644
index 0000000000..4d9e031c79
--- /dev/null
+++ b/httpie/legacy/v3_2_0_session_header_format.py
@@ -0,0 +1,73 @@
+from typing import Any, Type, List, Dict, TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from httpie.sessions import Session
+
+
+OLD_HEADER_STORE_WARNING = '''\
+Outdated layout detected for the current session. Please consider updating it,
+in order to use the latest features regarding the header layout.
+
+For fixing the current session:
+
+    $ httpie cli sessions upgrade {hostname} {session_id}
+'''
+
+OLD_HEADER_STORE_WARNING_FOR_NAMED_SESSIONS = '''\
+
+For fixing all named sessions:
+
+    $ httpie cli sessions upgrade-all
+'''
+
+OLD_HEADER_STORE_LINK = '\nSee $INSERT_LINK for more information.'
+
+
+def pre_process(session: 'Session', headers: Any) -> List[Dict[str, Any]]:
+    """Serialize the headers into a unified form and issue a warning if
+    the session file is using the old layout."""
+
+    is_old_style = isinstance(headers, dict)
+    if is_old_style:
+        normalized_headers = list(headers.items())
+    else:
+        normalized_headers = [
+            (item['name'], item['value'])
+            for item in headers
+        ]
+
+    if is_old_style:
+        warning = OLD_HEADER_STORE_WARNING.format(hostname=session.bound_host, session_id=session.session_id)
+        if not session.is_anonymous:
+            warning += OLD_HEADER_STORE_WARNING_FOR_NAMED_SESSIONS
+        warning += OLD_HEADER_STORE_LINK
+        session.warn_legacy_usage(warning)
+
+    return normalized_headers
+
+
+def post_process(
+    normalized_headers: List[Dict[str, Any]],
+    *,
+    original_type: Type[Any]
+) -> Any:
+    """Deserialize given header store into the original form it was
+    used in."""
+
+    if issubclass(original_type, dict):
+        # For the legacy behavior, preserve the last value.
+        return {
+            item['name']: item['value']
+            for item in normalized_headers
+        }
+    else:
+        return normalized_headers
+
+
+def fix_layout(session: 'Session', *args, **kwargs) -> None:
+    from httpie.sessions import materialize_headers
+
+    if not isinstance(session['headers'], dict):
+        return None
+
+    session['headers'] = materialize_headers(session['headers'])
diff --git a/httpie/manager/__main__.py b/httpie/manager/__main__.py
index 922e3d2a55..ba345662fc 100644
--- a/httpie/manager/__main__.py
+++ b/httpie/manager/__main__.py
@@ -52,7 +52,6 @@ def program():
     try:
         exit_status = main()
     except KeyboardInterrupt:
-        from httpie.status import ExitStatus
         exit_status = ExitStatus.ERROR_CTRL_C
 
     return exit_status
diff --git a/httpie/manager/cli.py b/httpie/manager/cli.py
index 11c63d0a31..248cb8bb0e 100644
--- a/httpie/manager/cli.py
+++ b/httpie/manager/cli.py
@@ -1,39 +1,94 @@
 from textwrap import dedent
 from httpie.cli.argparser import HTTPieManagerArgumentParser
+from httpie.cli.options import Qualifiers, ARGPARSE_QUALIFIER_MAP, map_qualifiers, parser_to_parser_spec
 from httpie import __version__
 
+CLI_SESSION_UPGRADE_FLAGS = [
+    {
+        'flags': ['--bind-cookies'],
+        'action': 'store_true',
+        'default': False,
+        'help': 'Bind domainless cookies to the host that session belongs.'
+    }
+]
+
 COMMANDS = {
-    'plugins': {
-        'help': 'Manage HTTPie plugins.',
-        'install': [
-            'Install the given targets from PyPI '
-            'or from a local paths.',
-            {
-                'dest': 'targets',
-                'nargs': '+',
-                'help': 'targets to install'
-            }
-        ],
-        'upgrade': [
-            'Upgrade the given plugins',
-            {
-                'dest': 'targets',
-                'nargs': '+',
-                'help': 'targets to upgrade'
-            }
-        ],
-        'uninstall': [
-            'Uninstall the given HTTPie plugins.',
+    'cli': {
+        'help': 'Manage HTTPie for Terminal',
+        'export-args': [
+            'Export available options for the CLI',
             {
-                'dest': 'targets',
-                'nargs': '+',
-                'help': 'targets to install'
+                'flags': ['-f', '--format'],
+                'choices': ['json'],
+                'help': 'Format to export in.',
+                'default': 'json'
             }
         ],
-        'list': [
-            'List all installed HTTPie plugins.'
+        'check-updates': [
+            'Check for updates'
         ],
-    },
+        'sessions': {
+            'help': 'Manage HTTPie sessions',
+            'upgrade': [
+                'Upgrade the given HTTPie session with the latest '
+                'layout. A list of changes between different session versions '
+                'can be found in the official documentation.',
+                {
+                    'dest': 'hostname',
+                    'metavar': 'HOSTNAME',
+                    'help': 'The host this session belongs.'
+                },
+                {
+                    'dest': 'session',
+                    'metavar': 'SESSION_NAME_OR_PATH',
+                    'help': 'The name or the path for the session that will be upgraded.'
+                },
+                *CLI_SESSION_UPGRADE_FLAGS
+            ],
+            'upgrade-all': [
+                'Upgrade all named sessions with the latest layout. A list of '
+                'changes between different session versions can be found in the official '
+                'documentation.',
+                *CLI_SESSION_UPGRADE_FLAGS
+            ],
+        }
+    }
+}
+
+
+COMMANDS['plugins'] = COMMANDS['cli']['plugins'] = {
+    'help': 'Manage HTTPie plugins.',
+    'install': [
+        'Install the given targets from PyPI '
+        'or from a local paths.',
+        {
+            'dest': 'targets',
+            'metavar': 'TARGET',
+            'nargs': Qualifiers.ONE_OR_MORE,
+            'help': 'targets to install'
+        }
+    ],
+    'upgrade': [
+        'Upgrade the given plugins',
+        {
+            'dest': 'targets',
+            'metavar': 'TARGET',
+            'nargs': Qualifiers.ONE_OR_MORE,
+            'help': 'targets to upgrade'
+        }
+    ],
+    'uninstall': [
+        'Uninstall the given HTTPie plugins.',
+        {
+            'dest': 'targets',
+            'metavar': 'TARGET',
+            'nargs': Qualifiers.ONE_OR_MORE,
+            'help': 'targets to install'
+        }
+    ],
+    'list': [
+        'List all installed HTTPie plugins.'
+    ],
 }
 
 
@@ -47,22 +102,28 @@ def missing_subcommand(*args) -> str:
     return f'Please specify one of these: {subcommands}'
 
 
-def generate_subparsers(root, parent_parser, definitions):
+def generate_subparsers(root, parent_parser, definitions, spec):
     action_dest = '_'.join(parent_parser.prog.split()[1:] + ['action'])
     actions = parent_parser.add_subparsers(
         dest=action_dest
     )
     for command, properties in definitions.items():
         is_subparser = isinstance(properties, dict)
+        properties = properties.copy()
+
         descr = properties.pop('help', None) if is_subparser else properties.pop(0)
         command_parser = actions.add_parser(command, description=descr)
         command_parser.root = root
         if is_subparser:
-            generate_subparsers(root, command_parser, properties)
+            generate_subparsers(root, command_parser, properties, spec)
             continue
 
+        group = spec.add_group(parent_parser.prog + ' ' + command, description=descr)
         for argument in properties:
-            command_parser.add_argument(**argument)
+            argument = argument.copy()
+            flags = argument.pop('flags', [])
+            command_parser.add_argument(*flags, **map_qualifiers(argument, ARGPARSE_QUALIFIER_MAP))
+            group.add_argument(*flags, **argument)
 
 
 parser = HTTPieManagerArgumentParser(
@@ -109,4 +170,12 @@ def generate_subparsers(root, parent_parser, definitions):
     '''
 )
 
-generate_subparsers(parser, parser, COMMANDS)
+man_page_hint = '''
+If you are looking for the man pages of http/https commands, try one of the following:
+    $ man http
+    $ man https
+
+'''
+
+options = parser_to_parser_spec(parser, man_page_hint=man_page_hint, source_file=__file__)
+generate_subparsers(parser, parser, COMMANDS, options)
diff --git a/httpie/manager/compat.py b/httpie/manager/compat.py
new file mode 100644
index 0000000000..18e18163a3
--- /dev/null
+++ b/httpie/manager/compat.py
@@ -0,0 +1,68 @@
+import sys
+import shutil
+import subprocess
+
+from contextlib import suppress
+from typing import List, Optional
+from httpie.compat import is_frozen
+
+
+class PipError(Exception):
+    """An exception that occurs when pip exits with an error status code."""
+
+    def __init__(self, stdout, stderr):
+        self.stdout = stdout
+        self.stderr = stderr
+
+
+def _discover_system_pip() -> List[str]:
+    # When we are running inside of a frozen binary, we need the system
+    # pip to install plugins since there is no way for us to execute any
+    # code outside of the HTTPie.
+    #
+    # We explicitly depend on system pip, so the SystemError should not
+    # be executed (except for broken installations).
+    def _check_pip_version(pip_location: Optional[str]) -> bool:
+        if not pip_location:
+            return False
+
+        with suppress(subprocess.CalledProcessError):
+            stdout = subprocess.check_output([pip_location, "--version"], text=True)
+            return "python 3" in stdout
+
+    targets = [
+        "pip",
+        "pip3"
+    ]
+    for target in targets:
+        pip_location = shutil.which(target)
+        if _check_pip_version(pip_location):
+            return pip_location
+
+    raise SystemError("Couldn't find 'pip' executable. Please ensure that pip in your system is available.")
+
+
+def _run_pip_subprocess(pip_executable: List[str], args: List[str]) -> bytes:
+
+    cmd = [*pip_executable, *args]
+    try:
+        process = subprocess.run(
+            cmd,
+            check=True,
+            shell=False,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE
+        )
+    except subprocess.CalledProcessError as error:
+        raise PipError(error.stdout, error.stderr) from error
+    else:
+        return process.stdout
+
+
+def run_pip(args: List[str]) -> bytes:
+    if is_frozen:
+        pip_executable = [_discover_system_pip()]
+    else:
+        pip_executable = [sys.executable, '-m', 'pip']
+
+    return _run_pip_subprocess(pip_executable, args)
diff --git a/httpie/manager/core.py b/httpie/manager/core.py
index e2134b5527..0d669ecc05 100644
--- a/httpie/manager/core.py
+++ b/httpie/manager/core.py
@@ -1,9 +1,10 @@
 import argparse
+from typing import Optional
 
 from httpie.context import Environment
-from httpie.manager.plugins import PluginInstaller
 from httpie.status import ExitStatus
 from httpie.manager.cli import missing_subcommand, parser
+from httpie.manager.tasks import CLI_TASKS
 
 MSG_COMMAND_CONFUSION = '''\
 This command is only for managing HTTPie plugins.
@@ -22,12 +23,20 @@
 '''.rstrip("\n").format(args='POST pie.dev/post hello=world')
 
 
+def dispatch_cli_task(env: Environment, action: Optional[str], args: argparse.Namespace) -> ExitStatus:
+    if action is None:
+        parser.error(missing_subcommand('cli'))
+
+    return CLI_TASKS[action](env, args)
+
+
 def program(args: argparse.Namespace, env: Environment) -> ExitStatus:
     if args.action is None:
         parser.error(MSG_NAKED_INVOCATION)
 
     if args.action == 'plugins':
-        plugins = PluginInstaller(env, debug=args.debug)
-        return plugins.run(args.plugins_action, args)
+        return dispatch_cli_task(env, args.action, args)
+    elif args.action == 'cli':
+        return dispatch_cli_task(env, args.cli_action, args)
 
     return ExitStatus.SUCCESS
diff --git a/httpie/manager/tasks/__init__.py b/httpie/manager/tasks/__init__.py
new file mode 100644
index 0000000000..b9b30fb39f
--- /dev/null
+++ b/httpie/manager/tasks/__init__.py
@@ -0,0 +1,11 @@
+from httpie.manager.tasks.sessions import cli_sessions
+from httpie.manager.tasks.export_args import cli_export_args
+from httpie.manager.tasks.plugins import cli_plugins
+from httpie.manager.tasks.check_updates import cli_check_updates
+
+CLI_TASKS = {
+    'sessions': cli_sessions,
+    'export-args': cli_export_args,
+    'plugins': cli_plugins,
+    'check-updates': cli_check_updates
+}
diff --git a/httpie/manager/tasks/check_updates.py b/httpie/manager/tasks/check_updates.py
new file mode 100644
index 0000000000..07fd1240bc
--- /dev/null
+++ b/httpie/manager/tasks/check_updates.py
@@ -0,0 +1,10 @@
+import argparse
+from httpie.context import Environment
+from httpie.status import ExitStatus
+from httpie.internal.update_warnings import fetch_updates, get_update_status
+
+
+def cli_check_updates(env: Environment, args: argparse.Namespace) -> ExitStatus:
+    fetch_updates(env, lazy=False)
+    env.stdout.write(get_update_status(env))
+    return ExitStatus.SUCCESS
diff --git a/httpie/manager/tasks/export_args.py b/httpie/manager/tasks/export_args.py
new file mode 100644
index 0000000000..9a684a4913
--- /dev/null
+++ b/httpie/manager/tasks/export_args.py
@@ -0,0 +1,27 @@
+import argparse
+import json
+
+from httpie.cli.definition import options
+from httpie.cli.options import to_data
+from httpie.output.writer import write_raw_data
+from httpie.status import ExitStatus
+from httpie.context import Environment
+
+
+FORMAT_TO_CONTENT_TYPE = {
+    'json': 'application/json'
+}
+
+
+def cli_export_args(env: Environment, args: argparse.Namespace) -> ExitStatus:
+    if args.format == 'json':
+        data = json.dumps(to_data(options))
+    else:
+        raise NotImplementedError(f'Unexpected format value: {args.format}')
+
+    write_raw_data(
+        env,
+        data,
+        stream_kwargs={'mime_overwrite': FORMAT_TO_CONTENT_TYPE[args.format]},
+    )
+    return ExitStatus.SUCCESS
diff --git a/httpie/manager/plugins.py b/httpie/manager/tasks/plugins.py
similarity index 83%
rename from httpie/manager/plugins.py
rename to httpie/manager/tasks/plugins.py
index 899e992563..c3c7d540c7 100644
--- a/httpie/manager/plugins.py
+++ b/httpie/manager/tasks/plugins.py
@@ -1,20 +1,19 @@
 import argparse
 import os
-import subprocess
-import sys
 import textwrap
 import re
 import shutil
 from collections import defaultdict
 from contextlib import suppress
 from pathlib import Path
-from typing import Tuple, Optional, List
+from typing import List, Optional, Tuple
 
+from httpie.manager.compat import PipError, run_pip
 from httpie.manager.cli import parser, missing_subcommand
-from httpie.compat import importlib_metadata, get_dist_name
+from httpie.compat import get_dist_name, importlib_metadata
 from httpie.context import Environment
 from httpie.status import ExitStatus
-from httpie.utils import as_site
+from httpie.utils import get_site_paths
 
 PEP_503 = re.compile(r"[-_.]+")
 
@@ -58,46 +57,37 @@ def fail(
         self.env.stderr.write(message + '\n')
         return ExitStatus.ERROR
 
-    def pip(self, *args, **kwargs) -> subprocess.CompletedProcess:
-        options = {
-            'check': True,
-            'shell': False,
-            'stdout': self.env.stdout,
-            'stderr': subprocess.PIPE,
-        }
-        options.update(kwargs)
-
-        cmd = [sys.executable, '-m', 'pip', *args]
-        return subprocess.run(
-            cmd,
-            **options
-        )
-
-    def _install(self, targets: List[str], mode='install', **process_options) -> Tuple[
-        Optional[bytes], ExitStatus
+    def _install(self, targets: List[str], mode='install') -> Tuple[
+        bytes, ExitStatus
     ]:
         pip_args = [
             'install',
+            '--prefer-binary',
             f'--prefix={self.dir}',
             '--no-warn-script-location',
         ]
         if mode == 'upgrade':
             pip_args.append('--upgrade')
+        pip_args.extend(targets)
 
         try:
-            process = self.pip(
-                *pip_args,
-                *targets,
-                **process_options,
-            )
-        except subprocess.CalledProcessError as error:
+            stdout = run_pip(pip_args)
+        except PipError as pip_error:
+            error = pip_error
+            stdout = pip_error.stdout
+        else:
+            error = None
+
+        self.env.stdout.write(stdout.decode())
+
+        if error:
             reason = None
             if error.stderr:
                 stderr = error.stderr.decode()
 
                 if self.debug:
                     self.env.stderr.write('Command failed: ')
-                    self.env.stderr.write(' '.join(error.cmd) + '\n')
+                    self.env.stderr.write('pip ' + ' '.join(pip_args) + '\n')
                     self.env.stderr.write(textwrap.indent('  ', stderr))
 
                 last_line = stderr.strip().splitlines()[-1]
@@ -108,7 +98,6 @@ def _install(self, targets: List[str], mode='install', **process_options) -> Tup
             stdout = error.stdout
             exit_status = self.fail(mode, ', '.join(targets), reason)
         else:
-            stdout = process.stdout
             exit_status = ExitStatus.SUCCESS
 
         return stdout, exit_status
@@ -124,10 +113,11 @@ def _clear_metadata(self, targets: List[str]) -> None:
         # existing metadata for old versions manually.
         # [0]: https://github.com/pypa/pip/issues/10727
         result_deps = defaultdict(list)
-        for child in as_site(self.dir).iterdir():
-            if child.suffix in {'.dist-info', '.egg-info'}:
-                name, _, version = child.stem.rpartition('-')
-                result_deps[name].append((version, child))
+        for site_dir in get_site_paths(self.dir):
+            for child in site_dir.iterdir():
+                if child.suffix in {'.dist-info', '.egg-info'}:
+                    name, _, version = child.stem.rpartition('-')
+                    result_deps[name].append((version, child))
 
         for target in targets:
             name, _, version = target.rpartition('-')
@@ -145,15 +135,12 @@ def upgrade(self, targets: List[str]) -> ExitStatus:
 
         raw_stdout, exit_status = self._install(
             targets,
-            mode='upgrade',
-            stdout=subprocess.PIPE
+            mode='upgrade'
         )
         if not raw_stdout:
             return exit_status
 
         stdout = raw_stdout.decode()
-        self.env.stdout.write(stdout)
-
         installation_line = stdout.splitlines()[-1]
         if installation_line.startswith('Successfully installed'):
             self._clear_metadata(installation_line.split()[2:])
@@ -178,7 +165,7 @@ def _uninstall(self, target: str) -> Optional[ExitStatus]:
             return self.fail('uninstall', target, 'couldn\'t locate the package')
 
         # TODO: Consider handling failures here (e.g if it fails,
-        # just rever the operation and leave the site-packages
+        # just revert the operation and leave the site-packages
         # in a proper shape).
         for file in files:
             with suppress(FileNotFoundError):
@@ -248,3 +235,14 @@ def run(
                 status = self.list()
 
         return status or ExitStatus.SUCCESS
+
+
+def cli_plugins(env: Environment, args: argparse.Namespace) -> ExitStatus:
+    plugins = PluginInstaller(env, debug=args.debug)
+
+    try:
+        action = args.cli_plugins_action
+    except AttributeError:
+        action = args.plugins_action
+
+    return plugins.run(action, args)
diff --git a/httpie/manager/tasks/sessions.py b/httpie/manager/tasks/sessions.py
new file mode 100644
index 0000000000..f84a1c44bb
--- /dev/null
+++ b/httpie/manager/tasks/sessions.py
@@ -0,0 +1,86 @@
+import argparse
+
+from httpie.sessions import SESSIONS_DIR_NAME, get_httpie_session
+from httpie.status import ExitStatus
+from httpie.context import Environment
+from httpie.legacy import v3_1_0_session_cookie_format, v3_2_0_session_header_format
+from httpie.manager.cli import missing_subcommand, parser
+from httpie.utils import is_version_greater
+
+
+FIXERS_TO_VERSIONS = {
+    '3.1.0': v3_1_0_session_cookie_format.fix_layout,
+    '3.2.0': v3_2_0_session_header_format.fix_layout,
+}
+
+
+def cli_sessions(env: Environment, args: argparse.Namespace) -> ExitStatus:
+    action = args.cli_sessions_action
+    if action is None:
+        parser.error(missing_subcommand('cli', 'sessions'))
+
+    if action == 'upgrade':
+        return cli_upgrade_session(env, args)
+    elif action == 'upgrade-all':
+        return cli_upgrade_all_sessions(env, args)
+    else:
+        raise ValueError(f'Unexpected action: {action}')
+
+
+def upgrade_session(env: Environment, args: argparse.Namespace, hostname: str, session_name: str):
+    session = get_httpie_session(
+        env=env,
+        config_dir=env.config.directory,
+        session_name=session_name,
+        host=hostname,
+        url=hostname,
+        suppress_legacy_warnings=True
+    )
+
+    session_name = session.path.stem
+    if session.is_new():
+        env.log_error(f'{session_name!r} @ {hostname!r} does not exist.')
+        return ExitStatus.ERROR
+
+    fixers = [
+        fixer
+        for version, fixer in FIXERS_TO_VERSIONS.items()
+        if is_version_greater(version, session.version)
+    ]
+
+    if len(fixers) == 0:
+        env.stdout.write(f'{session_name!r} @ {hostname!r} is already up to date.\n')
+        return ExitStatus.SUCCESS
+
+    for fixer in fixers:
+        fixer(session, hostname, args)
+
+    session.save(bump_version=True)
+    env.stdout.write(f'Upgraded {session_name!r} @ {hostname!r} to v{session.version}\n')
+    return ExitStatus.SUCCESS
+
+
+def cli_upgrade_session(env: Environment, args: argparse.Namespace) -> ExitStatus:
+    return upgrade_session(
+        env,
+        args=args,
+        hostname=args.hostname,
+        session_name=args.session
+    )
+
+
+def cli_upgrade_all_sessions(env: Environment, args: argparse.Namespace) -> ExitStatus:
+    session_dir_path = env.config_dir / SESSIONS_DIR_NAME
+
+    status = ExitStatus.SUCCESS
+    for host_path in session_dir_path.iterdir():
+        hostname = host_path.name
+        for session_path in host_path.glob("*.json"):
+            session_name = session_path.stem
+            status |= upgrade_session(
+                env,
+                args=args,
+                hostname=hostname,
+                session_name=session_name
+            )
+    return status
diff --git a/httpie/models.py b/httpie/models.py
index 5faf4ee0c7..a0a68c8ddc 100644
--- a/httpie/models.py
+++ b/httpie/models.py
@@ -1,6 +1,7 @@
 from time import monotonic
 
 import requests
+from urllib3.util import SKIP_HEADER, SKIPPABLE_HEADERS
 
 from enum import Enum, auto
 from typing import Iterable, Union, NamedTuple
@@ -16,7 +17,6 @@
 from .compat import cached_property
 from .utils import split_cookies, parse_content_type_header
 
-
 ELAPSED_TIME_LABEL = 'Elapsed time'
 
 
@@ -67,23 +67,10 @@ def iter_body(self, chunk_size=1):
     def iter_lines(self, chunk_size):
         return ((line, b'\n') for line in self._orig.iter_lines(chunk_size))
 
-    # noinspection PyProtectedMember
     @property
     def headers(self):
-        try:
-            raw_version = self._orig.raw._original_response.version
-        except AttributeError:
-            # Assume HTTP/1.1
-            raw_version = 11
-        version = {
-            9: '0.9',
-            10: '1.0',
-            11: '1.1',
-            20: '2',
-        }[raw_version]
-
         original = self._orig
-        status_line = f'HTTP/{version} {original.status_code} {original.reason}'
+        status_line = f'HTTP/{self.version} {original.status_code} {original.reason}'
         headers = [status_line]
         headers.extend(
             ': '.join(header)
@@ -113,6 +100,32 @@ def metadata(self) -> str:
             for key, value in data.items()
         )
 
+    @property
+    def version(self) -> str:
+        """
+        Return the HTTP version used by the server, e.g. '1.1'.
+
+        Assume HTTP/1.1 if version is not available.
+
+        """
+        mapping = {
+            9: '0.9',
+            10: '1.0',
+            11: '1.1',
+            20: '2.0',
+        }
+        fallback = 11
+        version = None
+        try:
+            raw = self._orig.raw
+            if getattr(raw, '_original_response', None):
+                version = raw._original_response.version
+            else:
+                version = raw.version
+        except AttributeError:
+            pass
+        return mapping[version or fallback]
+
 
 class HTTPRequest(HTTPMessage):
     """A :class:`requests.models.Request` wrapper."""
@@ -140,6 +153,7 @@ def headers(self):
         headers = [
             f'{name}: {value if isinstance(value, str) else value.decode()}'
             for name, value in headers.items()
+            if not (name.lower() in SKIPPABLE_HEADERS and value == SKIP_HEADER)
         ]
 
         headers.insert(0, request_line)
diff --git a/httpie/output/formatters/colors.py b/httpie/output/formatters/colors.py
index c12c31c3e4..0d9bd12e2f 100644
--- a/httpie/output/formatters/colors.py
+++ b/httpie/output/formatters/colors.py
@@ -17,14 +17,15 @@
 
 from ..lexers.json import EnhancedJsonLexer
 from ..lexers.metadata import MetadataLexer
-from ..ui.palette import SHADE_NAMES, get_color
+from ..ui.palette import AUTO_STYLE, SHADE_TO_PIE_STYLE, PieColor, ColorString, get_color
 from ...context import Environment
 from ...plugins import FormatterPlugin
 
 
-AUTO_STYLE = 'auto'  # Follows terminal ANSI color styles
 DEFAULT_STYLE = AUTO_STYLE
 SOLARIZED_STYLE = 'solarized'  # Bundled here
+PYGMENTS_BOLD = ColorString('bold')
+PYGMENTS_ITALIC = ColorString('italic')
 
 BUNDLED_STYLES = {
     SOLARIZED_STYLE,
@@ -33,7 +34,7 @@
 
 
 def get_available_styles():
-    return BUNDLED_STYLES | set(pygments.styles.get_all_styles())
+    return sorted(BUNDLED_STYLES | set(pygments.styles.get_all_styles()))
 
 
 class ColorFormatter(FormatterPlugin):
@@ -254,11 +255,11 @@ class Solarized256Style(pygments.style.Style):
         pygments.token.Comment.Preproc: GREEN,
         pygments.token.Comment.Special: GREEN,
         pygments.token.Generic.Deleted: CYAN,
-        pygments.token.Generic.Emph: 'italic',
+        pygments.token.Generic.Emph: PYGMENTS_ITALIC,
         pygments.token.Generic.Error: RED,
         pygments.token.Generic.Heading: ORANGE,
         pygments.token.Generic.Inserted: GREEN,
-        pygments.token.Generic.Strong: 'bold',
+        pygments.token.Generic.Strong: PYGMENTS_BOLD,
         pygments.token.Generic.Subheading: ORANGE,
         pygments.token.Token: BASE1,
         pygments.token.Token.Other: ORANGE,
@@ -267,86 +268,86 @@ class Solarized256Style(pygments.style.Style):
 
 PIE_HEADER_STYLE = {
     # HTTP line / Headers / Etc.
-    pygments.token.Name.Namespace: 'bold primary',
-    pygments.token.Keyword.Reserved: 'bold grey',
-    pygments.token.Operator: 'bold grey',
-    pygments.token.Number: 'bold grey',
-    pygments.token.Name.Function.Magic: 'bold green',
-    pygments.token.Name.Exception: 'bold green',
-    pygments.token.Name.Attribute: 'blue',
-    pygments.token.String: 'primary',
+    pygments.token.Name.Namespace: PYGMENTS_BOLD | PieColor.PRIMARY,
+    pygments.token.Keyword.Reserved: PYGMENTS_BOLD | PieColor.GREY,
+    pygments.token.Operator: PYGMENTS_BOLD | PieColor.GREY,
+    pygments.token.Number: PYGMENTS_BOLD | PieColor.GREY,
+    pygments.token.Name.Function.Magic: PYGMENTS_BOLD | PieColor.GREEN,
+    pygments.token.Name.Exception: PYGMENTS_BOLD | PieColor.GREEN,
+    pygments.token.Name.Attribute: PieColor.BLUE,
+    pygments.token.String: PieColor.PRIMARY,
 
     # HTTP Methods
-    pygments.token.Name.Function: 'bold grey',
-    pygments.token.Name.Function.HTTP.GET: 'bold green',
-    pygments.token.Name.Function.HTTP.HEAD: 'bold green',
-    pygments.token.Name.Function.HTTP.POST: 'bold yellow',
-    pygments.token.Name.Function.HTTP.PUT: 'bold orange',
-    pygments.token.Name.Function.HTTP.PATCH: 'bold orange',
-    pygments.token.Name.Function.HTTP.DELETE: 'bold red',
+    pygments.token.Name.Function: PYGMENTS_BOLD | PieColor.GREY,
+    pygments.token.Name.Function.HTTP.GET: PYGMENTS_BOLD | PieColor.GREEN,
+    pygments.token.Name.Function.HTTP.HEAD: PYGMENTS_BOLD | PieColor.GREEN,
+    pygments.token.Name.Function.HTTP.POST: PYGMENTS_BOLD | PieColor.YELLOW,
+    pygments.token.Name.Function.HTTP.PUT: PYGMENTS_BOLD | PieColor.ORANGE,
+    pygments.token.Name.Function.HTTP.PATCH: PYGMENTS_BOLD | PieColor.ORANGE,
+    pygments.token.Name.Function.HTTP.DELETE: PYGMENTS_BOLD | PieColor.RED,
 
     # HTTP status codes
-    pygments.token.Number.HTTP.INFO: 'bold aqua',
-    pygments.token.Number.HTTP.OK: 'bold green',
-    pygments.token.Number.HTTP.REDIRECT: 'bold yellow',
-    pygments.token.Number.HTTP.CLIENT_ERR: 'bold orange',
-    pygments.token.Number.HTTP.SERVER_ERR: 'bold red',
+    pygments.token.Number.HTTP.INFO: PYGMENTS_BOLD | PieColor.AQUA,
+    pygments.token.Number.HTTP.OK: PYGMENTS_BOLD | PieColor.GREEN,
+    pygments.token.Number.HTTP.REDIRECT: PYGMENTS_BOLD | PieColor.YELLOW,
+    pygments.token.Number.HTTP.CLIENT_ERR: PYGMENTS_BOLD | PieColor.ORANGE,
+    pygments.token.Number.HTTP.SERVER_ERR: PYGMENTS_BOLD | PieColor.RED,
 
     # Metadata
-    pygments.token.Name.Decorator: 'grey',
-    pygments.token.Number.SPEED.FAST: 'bold green',
-    pygments.token.Number.SPEED.AVG: 'bold yellow',
-    pygments.token.Number.SPEED.SLOW: 'bold orange',
-    pygments.token.Number.SPEED.VERY_SLOW: 'bold red',
+    pygments.token.Name.Decorator: PieColor.GREY,
+    pygments.token.Number.SPEED.FAST: PYGMENTS_BOLD | PieColor.GREEN,
+    pygments.token.Number.SPEED.AVG: PYGMENTS_BOLD | PieColor.YELLOW,
+    pygments.token.Number.SPEED.SLOW: PYGMENTS_BOLD | PieColor.ORANGE,
+    pygments.token.Number.SPEED.VERY_SLOW: PYGMENTS_BOLD | PieColor.RED,
 }
 
 PIE_BODY_STYLE = {
     # {}[]:
-    pygments.token.Punctuation: 'grey',
+    pygments.token.Punctuation: PieColor.GREY,
 
     # Keys
-    pygments.token.Name.Tag: 'pink',
+    pygments.token.Name.Tag: PieColor.PINK,
 
     # Values
-    pygments.token.Literal.String: 'green',
-    pygments.token.Literal.String.Double: 'green',
-    pygments.token.Literal.Number: 'aqua',
-    pygments.token.Keyword: 'orange',
+    pygments.token.Literal.String: PieColor.GREEN,
+    pygments.token.Literal.String.Double: PieColor.GREEN,
+    pygments.token.Literal.Number: PieColor.AQUA,
+    pygments.token.Keyword: PieColor.ORANGE,
 
     # Other stuff
-    pygments.token.Text: 'primary',
-    pygments.token.Name.Attribute: 'primary',
-    pygments.token.Name.Builtin: 'blue',
-    pygments.token.Name.Builtin.Pseudo: 'blue',
-    pygments.token.Name.Class: 'blue',
-    pygments.token.Name.Constant: 'orange',
-    pygments.token.Name.Decorator: 'blue',
-    pygments.token.Name.Entity: 'orange',
-    pygments.token.Name.Exception: 'yellow',
-    pygments.token.Name.Function: 'blue',
-    pygments.token.Name.Variable: 'blue',
-    pygments.token.String: 'aqua',
-    pygments.token.String.Backtick: 'secondary',
-    pygments.token.String.Char: 'aqua',
-    pygments.token.String.Doc: 'aqua',
-    pygments.token.String.Escape: 'red',
-    pygments.token.String.Heredoc: 'aqua',
-    pygments.token.String.Regex: 'red',
-    pygments.token.Number: 'aqua',
-    pygments.token.Operator: 'primary',
-    pygments.token.Operator.Word: 'green',
-    pygments.token.Comment: 'secondary',
-    pygments.token.Comment.Preproc: 'green',
-    pygments.token.Comment.Special: 'green',
-    pygments.token.Generic.Deleted: 'aqua',
-    pygments.token.Generic.Emph: 'italic',
-    pygments.token.Generic.Error: 'red',
-    pygments.token.Generic.Heading: 'orange',
-    pygments.token.Generic.Inserted: 'green',
-    pygments.token.Generic.Strong: 'bold',
-    pygments.token.Generic.Subheading: 'orange',
-    pygments.token.Token: 'primary',
-    pygments.token.Token.Other: 'orange',
+    pygments.token.Text: PieColor.PRIMARY,
+    pygments.token.Name.Attribute: PieColor.PRIMARY,
+    pygments.token.Name.Builtin: PieColor.BLUE,
+    pygments.token.Name.Builtin.Pseudo: PieColor.BLUE,
+    pygments.token.Name.Class: PieColor.BLUE,
+    pygments.token.Name.Constant: PieColor.ORANGE,
+    pygments.token.Name.Decorator: PieColor.BLUE,
+    pygments.token.Name.Entity: PieColor.ORANGE,
+    pygments.token.Name.Exception: PieColor.YELLOW,
+    pygments.token.Name.Function: PieColor.BLUE,
+    pygments.token.Name.Variable: PieColor.BLUE,
+    pygments.token.String: PieColor.AQUA,
+    pygments.token.String.Backtick: PieColor.SECONDARY,
+    pygments.token.String.Char: PieColor.AQUA,
+    pygments.token.String.Doc: PieColor.AQUA,
+    pygments.token.String.Escape: PieColor.RED,
+    pygments.token.String.Heredoc: PieColor.AQUA,
+    pygments.token.String.Regex: PieColor.RED,
+    pygments.token.Number: PieColor.AQUA,
+    pygments.token.Operator: PieColor.PRIMARY,
+    pygments.token.Operator.Word: PieColor.GREEN,
+    pygments.token.Comment: PieColor.SECONDARY,
+    pygments.token.Comment.Preproc: PieColor.GREEN,
+    pygments.token.Comment.Special: PieColor.GREEN,
+    pygments.token.Generic.Deleted: PieColor.AQUA,
+    pygments.token.Generic.Emph: PYGMENTS_ITALIC,
+    pygments.token.Generic.Error: PieColor.RED,
+    pygments.token.Generic.Heading: PieColor.ORANGE,
+    pygments.token.Generic.Inserted: PieColor.GREEN,
+    pygments.token.Generic.Strong: PYGMENTS_BOLD,
+    pygments.token.Generic.Subheading: PieColor.ORANGE,
+    pygments.token.Token: PieColor.PRIMARY,
+    pygments.token.Token.Other: PieColor.ORANGE,
 }
 
 
@@ -370,7 +371,7 @@ def format_value(value):
 def make_styles():
     styles = {}
 
-    for shade, name in SHADE_NAMES.items():
+    for shade, name in SHADE_TO_PIE_STYLE.items():
         styles[name] = [
             make_style(name, style_map, shade)
             for style_name, style_map in [
diff --git a/httpie/output/lexers/http.py b/httpie/output/lexers/http.py
index f06a685380..aea827401e 100644
--- a/httpie/output/lexers/http.py
+++ b/httpie/output/lexers/http.py
@@ -2,7 +2,7 @@
 import pygments
 from httpie.output.lexers.common import precise
 
-RE_STATUS_LINE = re.compile(r'(\d{3})( +)(.+)')
+RE_STATUS_LINE = re.compile(r'(\d{3})( +)?(.+)?')
 
 STATUS_TYPES = {
     '1': pygments.token.Number.HTTP.INFO,
diff --git a/httpie/output/models.py b/httpie/output/models.py
new file mode 100644
index 0000000000..e65199b07b
--- /dev/null
+++ b/httpie/output/models.py
@@ -0,0 +1,44 @@
+import argparse
+from typing import Any, Dict, Union, List, NamedTuple, Optional
+
+from httpie.context import Environment
+from httpie.cli.constants import PrettyOptions, PRETTY_MAP, PRETTY_STDOUT_TTY_ONLY
+from httpie.cli.argtypes import PARSED_DEFAULT_FORMAT_OPTIONS
+from httpie.output.formatters.colors import AUTO_STYLE
+
+
+class ProcessingOptions(NamedTuple):
+    """Represents a set of stylistic options
+    that are used when deciding which stream
+    should be used."""
+
+    debug: bool = False
+    traceback: bool = False
+
+    stream: bool = False
+    style: str = AUTO_STYLE
+    prettify: Union[List[str], PrettyOptions] = PRETTY_STDOUT_TTY_ONLY
+
+    response_mime: Optional[str] = None
+    response_charset: Optional[str] = None
+
+    json: bool = False
+    format_options: Dict[str, Any] = PARSED_DEFAULT_FORMAT_OPTIONS
+
+    def get_prettify(self, env: Environment) -> List[str]:
+        if self.prettify is PRETTY_STDOUT_TTY_ONLY:
+            return PRETTY_MAP['all' if env.stdout_isatty else 'none']
+        else:
+            return self.prettify
+
+    @classmethod
+    def from_raw_args(cls, options: argparse.Namespace) -> 'ProcessingOptions':
+        fetched_options = {
+            option: getattr(options, option)
+            for option in cls._fields
+        }
+        return cls(**fetched_options)
+
+    @property
+    def show_traceback(self):
+        return self.debug or self.traceback
diff --git a/httpie/output/streams.py b/httpie/output/streams.py
index ec275faa41..811093808a 100644
--- a/httpie/output/streams.py
+++ b/httpie/output/streams.py
@@ -34,7 +34,8 @@ def __init__(
         self,
         msg: HTTPMessage,
         output_options: OutputOptions,
-        on_body_chunk_downloaded: Callable[[bytes], None] = None
+        on_body_chunk_downloaded: Callable[[bytes], None] = None,
+        **kwargs
     ):
         """
         :param msg: a :class:`models.HTTPMessage` subclass
@@ -45,6 +46,7 @@ def __init__(
         self.msg = msg
         self.output_options = output_options
         self.on_body_chunk_downloaded = on_body_chunk_downloaded
+        self.extra_options = kwargs
 
     def get_headers(self) -> bytes:
         """Return the headers' bytes."""
diff --git a/httpie/output/ui/man_pages.py b/httpie/output/ui/man_pages.py
new file mode 100644
index 0000000000..0ba4974578
--- /dev/null
+++ b/httpie/output/ui/man_pages.py
@@ -0,0 +1,48 @@
+"""Logic for checking and displaying man pages."""
+
+import subprocess
+import os
+from httpie.context import Environment
+
+
+MAN_COMMAND = 'man'
+NO_MAN_PAGES = os.getenv('HTTPIE_NO_MAN_PAGES', False)
+
+# On some systems, HTTP(n) might exist, but we are only interested in HTTP(1).
+# For more information on man page sections: <https://unix.stackexchange.com/a/138643>
+MAN_PAGE_SECTION = '1'
+
+
+def is_available(program: str) -> bool:
+    """
+    Check whether `program`'s man pages are available on this system.
+
+    """
+    if NO_MAN_PAGES or os.system == 'nt':
+        return False
+    try:
+        process = subprocess.run(
+            [MAN_COMMAND, MAN_PAGE_SECTION, program],
+            shell=False,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL
+        )
+    except Exception:
+        # There might be some errors outside the process, e.g
+        # a permission error to execute something that is not an
+        # executable.
+        return False
+    else:
+        return process.returncode == 0
+
+
+def display_for(env: Environment, program: str) -> None:
+    """
+    Open the system man page for the given command (http/https/httpie).
+
+    """
+    subprocess.run(
+        [MAN_COMMAND, MAN_PAGE_SECTION, program],
+        stdout=env.stdout,
+        stderr=env.stderr
+    )
diff --git a/httpie/output/ui/palette.py b/httpie/output/ui/palette.py
index 64bba703be..5666b21f8c 100644
--- a/httpie/output/ui/palette.py
+++ b/httpie/output/ui/palette.py
@@ -1,17 +1,118 @@
-from typing import Optional
+from dataclasses import dataclass, field
+from enum import Enum, auto
+from typing import Optional, List
 
-STYLE_PIE = 'pie'
-STYLE_PIE_DARK = 'pie-dark'
-STYLE_PIE_LIGHT = 'pie-light'
 
+PYGMENTS_BRIGHT_BLACK = 'ansibrightblack'
 
+AUTO_STYLE = 'auto'  # Follows terminal ANSI color styles
+
+
+class Styles(Enum):
+    PIE = auto()
+    ANSI = auto()
+
+
+class PieStyle(str, Enum):
+    UNIVERSAL = 'pie'
+    DARK = 'pie-dark'
+    LIGHT = 'pie-light'
+
+
+PIE_STYLE_TO_SHADE = {
+    PieStyle.DARK: '500',
+    PieStyle.UNIVERSAL: '600',
+    PieStyle.LIGHT: '700',
+}
+SHADE_TO_PIE_STYLE = {
+    shade: style for style, shade in PIE_STYLE_TO_SHADE.items()
+}
+
+
+class ColorString(str):
+    def __or__(self, other: str) -> 'ColorString':
+        """Combine a style with a property.
+
+        E.g: PieColor.BLUE | BOLD | ITALIC
+        """
+        if isinstance(other, str):
+            # In case of PieColor.BLUE | SOMETHING
+            # we just create a new string.
+            return ColorString(self + ' ' + other)
+        elif isinstance(other, GenericColor):
+            # If we see a GenericColor, then we'll wrap it
+            # in with the desired property in a different class.
+            return _StyledGenericColor(other, styles=self.split())
+        elif isinstance(other, _StyledGenericColor):
+            # And if it is already wrapped, we'll just extend the
+            # list of properties.
+            other.styles.extend(self.split())
+            return other
+        else:
+            return NotImplemented
+
+
+class PieColor(ColorString, Enum):
+    """Styles that are available only in Pie themes."""
+
+    PRIMARY = 'primary'
+    SECONDARY = 'secondary'
+
+    WHITE = 'white'
+    BLACK = 'black'
+    GREY = 'grey'
+    AQUA = 'aqua'
+    PURPLE = 'purple'
+    ORANGE = 'orange'
+    RED = 'red'
+    BLUE = 'blue'
+    PINK = 'pink'
+    GREEN = 'green'
+    YELLOW = 'yellow'
+
+
+class GenericColor(Enum):
+    """Generic colors that are safe to use everywhere."""
+
+    # <https://rich.readthedocs.io/en/stable/appendix/colors.html>
+
+    WHITE = {Styles.PIE: PieColor.WHITE, Styles.ANSI: 'white'}
+    BLACK = {Styles.PIE: PieColor.BLACK, Styles.ANSI: 'black'}
+    GREEN = {Styles.PIE: PieColor.GREEN, Styles.ANSI: 'green'}
+    ORANGE = {Styles.PIE: PieColor.ORANGE, Styles.ANSI: 'yellow'}
+    YELLOW = {Styles.PIE: PieColor.YELLOW, Styles.ANSI: 'bright_yellow'}
+    BLUE = {Styles.PIE: PieColor.BLUE, Styles.ANSI: 'blue'}
+    PINK = {Styles.PIE: PieColor.PINK, Styles.ANSI: 'bright_magenta'}
+    PURPLE = {Styles.PIE: PieColor.PURPLE, Styles.ANSI: 'magenta'}
+    RED = {Styles.PIE: PieColor.RED, Styles.ANSI: 'red'}
+    AQUA = {Styles.PIE: PieColor.AQUA, Styles.ANSI: 'cyan'}
+    GREY = {Styles.PIE: PieColor.GREY, Styles.ANSI: 'bright_black'}
+
+    def apply_style(
+        self, style: Styles, *, style_name: Optional[str] = None
+    ) -> str:
+        """Apply the given style to a particular value."""
+        exposed_color = self.value[style]
+        if style is Styles.PIE:
+            assert style_name is not None
+            shade = PIE_STYLE_TO_SHADE[PieStyle(style_name)]
+            return get_color(exposed_color, shade)
+        else:
+            return exposed_color
+
+
+@dataclass
+class _StyledGenericColor:
+    color: 'GenericColor'
+    styles: List[str] = field(default_factory=list)
+
+
+# noinspection PyDictCreation
 COLOR_PALETTE = {
     # Copy the brand palette
-    'transparent': 'transparent',
-    'current': 'currentColor',
-    'white': '#F5F5F0',
-    'black': '#1C1818',
-    'grey': {
+    PieColor.WHITE: '#F5F5F0',
+    PieColor.BLACK: '#1C1818',
+    PieColor.GREY: {
         '50': '#F5F5F0',
         '100': '#EDEDEB',
         '200': '#D1D1CF',
@@ -24,7 +125,7 @@
         '900': '#1C1818',
         'DEFAULT': '#7D7D7D',
     },
-    'aqua': {
+    PieColor.AQUA: {
         '50': '#E8F0F5',
         '100': '#D6E3ED',
         '200': '#C4D9E5',
@@ -37,7 +138,7 @@
         '900': '#455966',
         'DEFAULT': '#8CB4CD',
     },
-    'purple': {
+    PieColor.PURPLE: {
         '50': '#F0E0FC',
         '100': '#E3C7FA',
         '200': '#D9ADF7',
@@ -50,7 +151,7 @@
         '900': '#5C2982',
         'DEFAULT': '#B464F0',
     },
-    'orange': {
+    PieColor.ORANGE: {
         '50': '#FFEDDB',
         '100': '#FFDEBF',
         '200': '#FFCFA3',
@@ -63,7 +164,7 @@
         '900': '#C75E0A',
         'DEFAULT': '#FFA24E',
     },
-    'red': {
+    PieColor.RED: {
         '50': '#FFE0DE',
         '100': '#FFC7C4',
         '200': '#FFB0AB',
@@ -76,7 +177,7 @@
         '900': '#910A00',
         'DEFAULT': '#FF665B',
     },
-    'blue': {
+    PieColor.BLUE: {
         '50': '#DBE3FA',
         '100': '#BFCFF5',
         '200': '#A1B8F2',
@@ -89,7 +190,7 @@
         '900': '#2B478F',
         'DEFAULT': '#4B78E6',
     },
-    'pink': {
+    PieColor.PINK: {
         '50': '#FFEBFF',
         '100': '#FCDBFC',
         '200': '#FCCCFC',
@@ -102,7 +203,7 @@
         '900': '#8C3D8A',
         'DEFAULT': '#FA9BFA',
     },
-    'green': {
+    PieColor.GREEN: {
         '50': '#E3F7E8',
         '100': '#CCF2D6',
         '200': '#B5EDC4',
@@ -115,7 +216,7 @@
         '900': '#307842',
         'DEFAULT': '#73DC8C',
     },
-    'yellow': {
+    PieColor.YELLOW: {
         '50': '#F7F7DB',
         '100': '#F2F2BF',
         '200': '#EDEDA6',
@@ -129,38 +230,39 @@
         'DEFAULT': '#DBDE52',
     },
 }
+COLOR_PALETTE.update(
+    {
+        # Terminal-specific palette customizations.
+        PieColor.GREY: {
+            # Grey is the same no matter shade for the colors
+            shade: COLOR_PALETTE[PieColor.GREY]['500']
+            for shade in COLOR_PALETTE[PieColor.GREY].keys()
+        },
+        PieColor.PRIMARY: {
+            '700': COLOR_PALETTE[PieColor.BLACK],
+            '600': PYGMENTS_BRIGHT_BLACK,
+            '500': COLOR_PALETTE[PieColor.WHITE],
+        },
+        PieColor.SECONDARY: {
+            '700': '#37523C',
+            '600': '#6c6969',
+            '500': '#6c6969',
+        },
+    }
+)
 
-# Grey is the same no matter shade for the colors
-COLOR_PALETTE['grey'] = {
-    shade: COLOR_PALETTE['grey']['500'] for shade in COLOR_PALETTE['grey'].keys()
-}
-
-COLOR_PALETTE['primary'] = {
-    '700': COLOR_PALETTE['black'],
-    '600': 'ansibrightblack',
-    '500': COLOR_PALETTE['white'],
-}
-
-COLOR_PALETTE['secondary'] = {'700': '#37523C', '600': '#6c6969', '500': '#6c6969'}
 
+def boldify(color: PieColor) -> str:
+    return f'bold {color}'
 
-SHADE_NAMES = {
-    '500': STYLE_PIE_DARK,
-    '600': STYLE_PIE,
-    '700': STYLE_PIE_LIGHT
-}
-
-SHADES = [
-    '50',
-    *map(str, range(100, 1000, 100))
-]
 
-
-def get_color(color: str, shade: str) -> Optional[str]:
-    if color not in COLOR_PALETTE:
+# noinspection PyDefaultArgument
+def get_color(
+    color: PieColor, shade: str, *, palette=COLOR_PALETTE
+) -> Optional[str]:
+    if color not in palette:
         return None
-
-    color_code = COLOR_PALETTE[color]
+    color_code = palette[color]
     if isinstance(color_code, dict) and shade in color_code:
         return color_code[shade]
     else:
diff --git a/httpie/output/ui/rich_help.py b/httpie/output/ui/rich_help.py
new file mode 100644
index 0000000000..2b19f3e33a
--- /dev/null
+++ b/httpie/output/ui/rich_help.py
@@ -0,0 +1,230 @@
+import re
+import textwrap
+from typing import AbstractSet, Iterable, Optional, Tuple
+
+from rich.console import RenderableType
+from rich.highlighter import RegexHighlighter
+from rich.padding import Padding
+from rich.table import Table
+from rich.text import Text
+
+from httpie.cli.constants import SEPARATOR_GROUP_ALL_ITEMS
+from httpie.cli.options import Argument, ParserSpec, Qualifiers
+from httpie.output.ui.palette import GenericColor
+
+SEPARATORS = '|'.join(map(re.escape, SEPARATOR_GROUP_ALL_ITEMS))
+
+STYLE_METAVAR = GenericColor.YELLOW
+STYLE_SWITCH = GenericColor.GREEN
+STYLE_PROGRAM_NAME = GenericColor.GREEN  # .boldify()
+STYLE_USAGE_OPTIONAL = GenericColor.GREY
+STYLE_USAGE_REGULAR = GenericColor.WHITE
+STYLE_USAGE_ERROR = GenericColor.RED
+STYLE_USAGE_MISSING = GenericColor.YELLOW
+STYLE_BOLD = 'bold'
+
+MAX_CHOICE_CHARS = 80
+
+LEFT_PADDING_2 = (0, 0, 0, 2)
+LEFT_PADDING_3 = (0, 0, 0, 3)
+LEFT_PADDING_4 = (0, 0, 0, 4)
+LEFT_PADDING_5 = (0, 0, 0, 4)
+
+LEFT_INDENT_2 = (1, 0, 0, 2)
+LEFT_INDENT_3 = (1, 0, 0, 3)
+LEFT_INDENT_BOTTOM_3 = (0, 0, 1, 3)
+
+MORE_INFO_COMMANDS = """
+To learn more, you can try:
+    -> running 'http --manual'
+    -> visiting our full documentation at https://httpie.io/docs/cli
+"""
+
+
+class OptionsHighlighter(RegexHighlighter):
+    highlights = [
+        r'(^|\W)(?P<option>\-{1,2}[\w|-]+)(?![a-zA-Z0-9])',
+        r'(?P<bold>HTTPie)',
+    ]
+
+
+options_highlighter = OptionsHighlighter()
+
+
+def unpack_argument(
+    argument: Argument,
+) -> Tuple[Text, Text]:
+    opt1 = opt2 = ''
+
+    style = None
+    if argument.aliases:
+        if len(argument.aliases) >= 2:
+            opt2, opt1 = argument.aliases
+        else:
+            (opt1,) = argument.aliases
+    else:
+        opt1 = argument.metavar
+        style = STYLE_USAGE_REGULAR
+
+    return Text(opt1, style=style), Text(opt2)
+
+
+def to_usage(
+    spec: ParserSpec,
+    *,
+    program_name: Optional[str] = None,
+    whitelist: AbstractSet[str] = frozenset()
+) -> RenderableType:
+    shown_arguments = [
+        argument
+        for group in spec.groups
+        for argument in group.arguments
+        if (not argument.aliases or whitelist.intersection(argument.aliases))
+    ]
+
+    # Sort the shown_arguments so that --dash options are
+    # shown first
+    shown_arguments.sort(key=lambda argument: argument.aliases, reverse=True)
+
+    text = Text(program_name or spec.program, style=STYLE_BOLD)
+    for argument in shown_arguments:
+        text.append(' ')
+
+        is_whitelisted = whitelist.intersection(argument.aliases)
+        if argument.aliases:
+            name = '/'.join(sorted(argument.aliases, key=len))
+        else:
+            name = argument.metavar
+
+        nargs = argument.configuration.get('nargs')
+        if nargs is Qualifiers.OPTIONAL:
+            text.append('[' + name + ']', style=STYLE_USAGE_OPTIONAL)
+        elif nargs is Qualifiers.ZERO_OR_MORE:
+            text.append(
+                '[' + name + ' ...]',
+                style=STYLE_USAGE_OPTIONAL,
+            )
+        else:
+            text.append(
+                name,
+                style=STYLE_USAGE_ERROR
+                if is_whitelisted
+                else STYLE_USAGE_REGULAR,
+            )
+
+        raw_form = argument.serialize()
+        if raw_form.get('choices'):
+            text.append(' ')
+            text.append(
+                '{' + ', '.join(raw_form['choices']) + '}',
+                style=STYLE_USAGE_MISSING,
+            )
+
+    return text
+
+
+# This part is loosely based on the rich-click's help message
+# generation.
+def to_help_message(
+    spec: ParserSpec,
+) -> Iterable[RenderableType]:
+    yield Padding(
+        options_highlighter(spec.description),
+        LEFT_INDENT_2,
+    )
+
+    yield Padding(
+        Text('Usage', style=STYLE_SWITCH),
+        LEFT_INDENT_2,
+    )
+    yield Padding(to_usage(spec), LEFT_INDENT_3)
+
+    group_rows = {}
+    for group in spec.groups:
+        options_rows = []
+
+        for argument in group.arguments:
+            if argument.is_hidden:
+                continue
+
+            opt1, opt2 = unpack_argument(argument)
+            if opt2:
+                opt1.append('/')
+                opt1.append(opt2)
+
+            # Column for a metavar, if we have one
+            metavar = Text(style=STYLE_METAVAR)
+            metavar.append(argument.configuration.get('metavar', ''))
+
+            if opt1 == metavar:
+                metavar = Text('')
+
+            raw_form = argument.serialize()
+            desc = raw_form.get('short_description', '')
+            if raw_form.get('choices'):
+                desc += ' (choices: '
+                desc += textwrap.shorten(
+                    ', '.join(raw_form.get('choices')),
+                    MAX_CHOICE_CHARS,
+                )
+                desc += ')'
+
+            rows = [
+                Padding(
+                    options_highlighter(opt1),
+                    LEFT_PADDING_2,
+                ),
+                metavar,
+                options_highlighter(desc),
+            ]
+
+            options_rows.append(rows)
+            if argument.configuration.get('nested_options'):
+                options_rows.extend(
+                    [
+                        (
+                            Padding(
+                                Text(
+                                    key,
+                                    style=STYLE_USAGE_OPTIONAL,
+                                ),
+                                LEFT_PADDING_4,
+                            ),
+                            value,
+                            dec,
+                        )
+                        for key, value, dec in argument.nested_options
+                    ]
+                )
+
+        group_rows[group.name] = options_rows
+
+    options_table = Table(highlight=False, box=None, show_header=False)
+    for group_name, options_rows in group_rows.items():
+        options_table.add_row(Text(), Text(), Text())
+        options_table.add_row(
+            Text(group_name, style=STYLE_SWITCH),
+            Text(),
+            Text(),
+        )
+        options_table.add_row(Text(), Text(), Text())
+        for row in options_rows:
+            options_table.add_row(*row)
+
+    yield Padding(
+        Text('Options', style=STYLE_SWITCH),
+        LEFT_INDENT_2,
+    )
+    yield Padding(options_table, LEFT_PADDING_2)
+    yield Padding(
+        Text('More Information', style=STYLE_SWITCH),
+        LEFT_INDENT_2,
+    )
+    yield Padding(
+        MORE_INFO_COMMANDS.rstrip('\n'),
+        LEFT_PADDING_3
+    )
+    yield Padding(
+        spec.epilog.rstrip('\n'),
+        LEFT_INDENT_BOTTOM_3,
+    )
diff --git a/httpie/output/ui/rich_palette.py b/httpie/output/ui/rich_palette.py
new file mode 100644
index 0000000000..103d463749
--- /dev/null
+++ b/httpie/output/ui/rich_palette.py
@@ -0,0 +1,73 @@
+from collections import ChainMap
+from typing import TYPE_CHECKING, Any, Optional
+
+if TYPE_CHECKING:
+    from rich.theme import Theme
+
+from httpie.output.ui.palette import GenericColor, PieStyle, Styles, ColorString, _StyledGenericColor  # noqa
+
+RICH_BOLD = ColorString('bold')
+
+# Rich-specific color code declarations
+# <https://github.com/Textualize/rich/blob/fcd684dd3a482977cab620e71ccaebb94bf13ac9/rich/default_styles.py>
+CUSTOM_STYLES = {
+    'progress.description': RICH_BOLD | GenericColor.WHITE,
+    'progress.data.speed': RICH_BOLD | GenericColor.GREEN,
+    'progress.percentage': RICH_BOLD | GenericColor.AQUA,
+    'progress.download': RICH_BOLD | GenericColor.AQUA,
+    'progress.remaining': RICH_BOLD | GenericColor.ORANGE,
+    'bar.complete': RICH_BOLD | GenericColor.PURPLE,
+    'bar.finished': RICH_BOLD | GenericColor.GREEN,
+    'bar.pulse': RICH_BOLD | GenericColor.PURPLE,
+    'option': RICH_BOLD | GenericColor.PINK,
+}
+
+
+class _GenericColorCaster(dict):
+    """
+    Translate GenericColor to a regular string on the attribute access
+    phase.
+    """
+
+    def _translate(self, key: Any) -> Any:
+        if isinstance(key, GenericColor):
+            return key.name.lower()
+        else:
+            return key
+
+    def __getitem__(self, key: Any) -> Any:
+        return super().__getitem__(self._translate(key))
+
+    def get(self, key: Any) -> Any:
+        return super().get(self._translate(key))
+
+
+def _make_rich_color_theme(style_name: Optional[str] = None) -> 'Theme':
+    from rich.style import Style
+    from rich.theme import Theme
+
+    try:
+        PieStyle(style_name)
+    except ValueError:
+        style = Styles.ANSI
+    else:
+        style = Styles.PIE
+
+    theme = Theme()
+    for color, color_set in ChainMap(
+        GenericColor.__members__, CUSTOM_STYLES
+    ).items():
+        if isinstance(color_set, _StyledGenericColor):
+            properties = dict.fromkeys(color_set.styles, True)
+            color_set = color_set.color
+        else:
+            properties = {}
+
+        theme.styles[color.lower()] = Style(
+            color=color_set.apply_style(style, style_name=style_name),
+            **properties,
+        )
+
+    # E.g translate GenericColor.BLUE into blue on key access
+    theme.styles = _GenericColorCaster(theme.styles)
+    return theme
diff --git a/httpie/output/ui/rich_progress.py b/httpie/output/ui/rich_progress.py
new file mode 100644
index 0000000000..d2cfd38c70
--- /dev/null
+++ b/httpie/output/ui/rich_progress.py
@@ -0,0 +1,141 @@
+from dataclasses import dataclass
+from typing import TYPE_CHECKING, Optional
+
+from httpie.context import Environment
+
+if TYPE_CHECKING:
+    from rich.console import Console
+
+
+@dataclass
+class BaseDisplay:
+    env: Environment
+
+    def start(
+        self, *, total: Optional[float], at: float, description: str
+    ) -> None:
+        ...
+
+    def update(self, steps: float) -> None:
+        ...
+
+    def stop(self, time_spent: float) -> None:
+        ...
+
+    @property
+    def console(self) -> 'Console':
+        """Returns the default console to be used with displays (stderr)."""
+        return self.env.rich_error_console
+
+    def _print_summary(
+        self, is_finished: bool, observed_steps: int, time_spent: float
+    ):
+        from rich import filesize
+
+        if is_finished:
+            verb = 'Done'
+        else:
+            verb = 'Interrupted'
+
+        total_size = filesize.decimal(observed_steps)
+        avg_speed = filesize.decimal(observed_steps / time_spent)
+
+        minutes, seconds = divmod(time_spent, 60)
+        hours, minutes = divmod(int(minutes), 60)
+        if hours:
+            total_time = f'{hours:d}:{minutes:02d}:{seconds:0.5f}'
+        else:
+            total_time = f'{minutes:02d}:{seconds:0.5f}'
+
+        self.console.print(
+            f'[progress.description]{verb}. {total_size} in {total_time} ({avg_speed}/s)'
+        )
+
+
+class DummyDisplay(BaseDisplay):
+    """
+    A dummy display object to be used when the progress bars,
+    spinners etc. are disabled globally (or during tests).
+    """
+
+
+class StatusDisplay(BaseDisplay):
+    def start(
+        self, *, total: Optional[float], at: float, description: str
+    ) -> None:
+        self.observed = at
+        self.description = (
+            f'[progress.description]{description}[/progress.description]'
+        )
+
+        self.status = self.console.status(self.description, spinner='line')
+        self.status.start()
+
+    def update(self, steps: float) -> None:
+        from rich import filesize
+
+        self.observed += steps
+
+        observed_amount, observed_unit = filesize.decimal(
+            self.observed
+        ).split()
+        self.status.update(
+            status=f'{self.description} [progress.download]{observed_amount}/? {observed_unit}[/progress.download]'
+        )
+
+    def stop(self, time_spent: float) -> None:
+        self.status.stop()
+        self.console.print(self.description)
+        if time_spent:
+            self._print_summary(
+                is_finished=True,
+                observed_steps=self.observed,
+                time_spent=time_spent,
+            )
+
+
+class ProgressDisplay(BaseDisplay):
+    def start(
+        self, *, total: Optional[float], at: float, description: str
+    ) -> None:
+        from rich.progress import (
+            Progress,
+            BarColumn,
+            DownloadColumn,
+            TimeRemainingColumn,
+            TransferSpeedColumn,
+        )
+
+        assert total is not None
+        self.console.print(f'[progress.description]{description}')
+        self.progress_bar = Progress(
+            '[',
+            BarColumn(),
+            ']',
+            '[progress.percentage]{task.percentage:>3.0f}%',
+            '(',
+            DownloadColumn(),
+            ')',
+            TimeRemainingColumn(),
+            TransferSpeedColumn(),
+            console=self.console,
+            transient=True,
+        )
+        self.progress_bar.start()
+        self.transfer_task = self.progress_bar.add_task(
+            description, completed=at, total=total
+        )
+
+    def update(self, steps: float) -> None:
+        self.progress_bar.advance(self.transfer_task, steps)
+
+    def stop(self, time_spent: Optional[float]) -> None:
+        self.progress_bar.stop()
+
+        if time_spent:
+            [task] = self.progress_bar.tasks
+            self._print_summary(
+                is_finished=task.finished,
+                observed_steps=task.completed,
+                time_spent=time_spent,
+            )
diff --git a/httpie/output/ui/rich_utils.py b/httpie/output/ui/rich_utils.py
new file mode 100644
index 0000000000..286b165739
--- /dev/null
+++ b/httpie/output/ui/rich_utils.py
@@ -0,0 +1,34 @@
+import os
+
+from typing import Iterator
+from contextlib import contextmanager
+
+from rich.console import Console, RenderableType
+from rich.highlighter import Highlighter
+
+from httpie.output.ui.rich_palette import _make_rich_color_theme
+
+
+def render_as_string(renderable: RenderableType) -> str:
+    """Render any `rich` object in a fake console and
+    return a *style-less* version of it as a string."""
+
+    with open(os.devnull, 'w') as null_stream:
+        fake_console = Console(file=null_stream, record=True, theme=_make_rich_color_theme())
+        fake_console.print(renderable)
+        return fake_console.export_text()
+
+
+@contextmanager
+def enable_highlighter(
+    console: Console,
+    highlighter: Highlighter,
+) -> Iterator[Console]:
+    """Enable a highlighter temporarily."""
+
+    original_highlighter = console.highlighter
+    try:
+        console.highlighter = highlighter
+        yield console
+    finally:
+        console.highlighter = original_highlighter
diff --git a/httpie/output/writer.py b/httpie/output/writer.py
index cbd06e9274..4a2949bce2 100644
--- a/httpie/output/writer.py
+++ b/httpie/output/writer.py
@@ -1,6 +1,6 @@
-import argparse
 import errno
-from typing import IO, TextIO, Tuple, Type, Union
+import requests
+from typing import Any, Dict, IO, Optional, TextIO, Tuple, Type, Union
 
 from ..cli.dicts import HTTPHeadersDict
 from ..context import Environment
@@ -10,12 +10,14 @@
     HTTPMessage,
     RequestsMessage,
     RequestsMessageKind,
-    OutputOptions
+    OutputOptions,
 )
+from .models import ProcessingOptions
 from .processing import Conversion, Formatting
 from .streams import (
     BaseStream, BufferedPrettyStream, EncodedStream, PrettyStream, RawStream,
 )
+from ..utils import parse_content_type_header
 
 
 MESSAGE_SEPARATOR = '\n\n'
@@ -25,30 +27,31 @@
 def write_message(
     requests_message: RequestsMessage,
     env: Environment,
-    args: argparse.Namespace,
     output_options: OutputOptions,
+    processing_options: ProcessingOptions,
+    extra_stream_kwargs: Optional[Dict[str, Any]] = None
 ):
     if not output_options.any():
         return
     write_stream_kwargs = {
         'stream': build_output_stream_for_message(
-            args=args,
             env=env,
             requests_message=requests_message,
             output_options=output_options,
+            processing_options=processing_options,
+            extra_stream_kwargs=extra_stream_kwargs
         ),
         # NOTE: `env.stdout` will in fact be `stderr` with `--download`
         'outfile': env.stdout,
-        'flush': env.stdout_isatty or args.stream
+        'flush': env.stdout_isatty or processing_options.stream
     }
     try:
-        if env.is_windows and 'colors' in args.prettify:
+        if env.is_windows and 'colors' in processing_options.get_prettify(env):
             write_stream_with_colors_win(**write_stream_kwargs)
         else:
             write_stream(**write_stream_kwargs)
     except OSError as e:
-        show_traceback = args.debug or args.traceback
-        if not show_traceback and e.errno == errno.EPIPE:
+        if processing_options.show_traceback and e.errno == errno.EPIPE:
             # Ignore broken pipes unless --traceback.
             env.stderr.write('\n')
         else:
@@ -94,11 +97,34 @@ def write_stream_with_colors_win(
             outfile.flush()
 
 
+def write_raw_data(
+    env: Environment,
+    data: Any,
+    *,
+    processing_options: Optional[ProcessingOptions] = None,
+    headers: Optional[HTTPHeadersDict] = None,
+    stream_kwargs: Optional[Dict[str, Any]] = None
+):
+    msg = requests.PreparedRequest()
+    msg.is_body_upload_chunk = True
+    msg.body = data
+    msg.headers = headers or HTTPHeadersDict()
+    msg_output_options = OutputOptions.from_message(msg, body=True, headers=False)
+    return write_message(
+        requests_message=msg,
+        env=env,
+        output_options=msg_output_options,
+        processing_options=processing_options or ProcessingOptions(),
+        extra_stream_kwargs=stream_kwargs
+    )
+
+
 def build_output_stream_for_message(
-    args: argparse.Namespace,
     env: Environment,
     requests_message: RequestsMessage,
     output_options: OutputOptions,
+    processing_options: ProcessingOptions,
+    extra_stream_kwargs: Optional[Dict[str, Any]] = None
 ):
     message_type = {
         RequestsMessageKind.REQUEST: HTTPRequest,
@@ -106,10 +132,12 @@ def build_output_stream_for_message(
     }[output_options.kind]
     stream_class, stream_kwargs = get_stream_type_and_kwargs(
         env=env,
-        args=args,
+        processing_options=processing_options,
         message_type=message_type,
         headers=requests_message.headers
     )
+    if extra_stream_kwargs:
+        stream_kwargs.update(extra_stream_kwargs)
     yield from stream_class(
         msg=message_type(requests_message),
         output_options=output_options,
@@ -124,20 +152,24 @@ def build_output_stream_for_message(
 
 def get_stream_type_and_kwargs(
     env: Environment,
-    args: argparse.Namespace,
+    processing_options: ProcessingOptions,
     message_type: Type[HTTPMessage],
     headers: HTTPHeadersDict,
 ) -> Tuple[Type['BaseStream'], dict]:
     """Pick the right stream type and kwargs for it based on `env` and `args`.
 
     """
-    is_stream = args.stream
+    is_stream = processing_options.stream
+    prettify_groups = processing_options.get_prettify(env)
     if not is_stream and message_type is HTTPResponse:
         # If this is a response, then check the headers for determining
         # auto-streaming.
-        is_stream = headers.get('Content-Type') == 'text/event-stream'
+        raw_content_type_header = headers.get('Content-Type', None)
+        if raw_content_type_header:
+            content_type_header, _ = parse_content_type_header(raw_content_type_header)
+            is_stream = (content_type_header == 'text/event-stream')
 
-    if not env.stdout_isatty and not args.prettify:
+    if not env.stdout_isatty and not prettify_groups:
         stream_class = RawStream
         stream_kwargs = {
             'chunk_size': (
@@ -153,19 +185,19 @@ def get_stream_type_and_kwargs(
         }
         if message_type is HTTPResponse:
             stream_kwargs.update({
-                'mime_overwrite': args.response_mime,
-                'encoding_overwrite': args.response_charset,
+                'mime_overwrite': processing_options.response_mime,
+                'encoding_overwrite': processing_options.response_charset,
             })
-        if args.prettify:
+        if prettify_groups:
             stream_class = PrettyStream if is_stream else BufferedPrettyStream
             stream_kwargs.update({
                 'conversion': Conversion(),
                 'formatting': Formatting(
                     env=env,
-                    groups=args.prettify,
-                    color_scheme=args.style,
-                    explicit_json=args.json,
-                    format_options=args.format_options,
+                    groups=prettify_groups,
+                    color_scheme=processing_options.style,
+                    explicit_json=processing_options.json,
+                    format_options=processing_options.format_options,
                 )
             })
 
diff --git a/httpie/plugins/builtin.py b/httpie/plugins/builtin.py
index 8a2dae615c..860aebf7f9 100644
--- a/httpie/plugins/builtin.py
+++ b/httpie/plugins/builtin.py
@@ -19,7 +19,7 @@ def __call__(
         """
         Override username/password serialization to allow unicode.
 
-        See https://github.com/httpie/httpie/issues/212
+        See https://github.com/httpie/cli/issues/212
 
         """
         # noinspection PyTypeChecker
diff --git a/httpie/plugins/manager.py b/httpie/plugins/manager.py
index 7a60a5c042..27af6eedac 100644
--- a/httpie/plugins/manager.py
+++ b/httpie/plugins/manager.py
@@ -4,13 +4,13 @@
 
 from itertools import groupby
 from operator import attrgetter
-from typing import Dict, List, Type, Iterator, Optional, ContextManager
+from typing import Dict, List, Type, Iterator, Iterable, Optional, ContextManager
 from pathlib import Path
 from contextlib import contextmanager, nullcontext
 
 from ..compat import importlib_metadata, find_entry_points, get_dist_name
 
-from ..utils import repr_dict, as_site
+from ..utils import repr_dict, get_site_paths
 from . import AuthPlugin, ConverterPlugin, FormatterPlugin, TransportPlugin
 from .base import BasePlugin
 
@@ -25,20 +25,24 @@
 
 
 @contextmanager
-def _load_directory(plugins_dir: Path) -> Iterator[None]:
-    plugins_path = os.fspath(plugins_dir)
-    sys.path.insert(0, plugins_path)
+def _load_directories(site_dirs: Iterable[Path]) -> Iterator[None]:
+    plugin_dirs = [
+        os.fspath(site_dir)
+        for site_dir in site_dirs
+    ]
+    sys.path.extend(plugin_dirs)
     try:
         yield
     finally:
-        sys.path.remove(plugins_path)
+        for plugin_dir in plugin_dirs:
+            sys.path.remove(plugin_dir)
 
 
 def enable_plugins(plugins_dir: Optional[Path]) -> ContextManager[None]:
     if plugins_dir is None:
         return nullcontext()
     else:
-        return _load_directory(as_site(plugins_dir))
+        return _load_directories(get_site_paths(plugins_dir))
 
 
 class PluginManager(list):
@@ -66,7 +70,7 @@ def load_installed_plugins(self, directory: Optional[Path] = None):
                 plugin = entry_point.load()
             except BaseException as exc:
                 warnings.warn(
-                    f'While loading "{plugin_name}", an error ocurred: {exc}\n'
+                    f'While loading "{plugin_name}", an error occurred: {exc}\n'
                     f'For uninstallations, please use either "httpie plugins uninstall {plugin_name}" '
                     f'or "pip uninstall {plugin_name}" (depending on how you installed it in the first '
                     'place).'
diff --git a/httpie/sessions.py b/httpie/sessions.py
index 176c03e76d..99dcdba92e 100644
--- a/httpie/sessions.py
+++ b/httpie/sessions.py
@@ -6,17 +6,25 @@
 import re
 
 from http.cookies import SimpleCookie
+from http.cookiejar import Cookie
 from pathlib import Path
-from typing import Iterable, Optional, Union
-from urllib.parse import urlsplit
+from typing import Any, Dict, List, Optional, Union
 
 from requests.auth import AuthBase
-from requests.cookies import RequestsCookieJar, create_cookie
+from requests.cookies import RequestsCookieJar, remove_cookie_by_name
 
+from .context import Environment, LogLevel
+from .cookies import HTTPieCookiePolicy
 from .cli.dicts import HTTPHeadersDict
 from .config import BaseConfigDict, DEFAULT_CONFIG_DIR
+from .utils import url_as_host
 from .plugins.registry import plugin_manager
 
+from .legacy import (
+    v3_1_0_session_cookie_format as legacy_cookies,
+    v3_2_0_session_header_format as legacy_headers
+)
+
 
 SESSIONS_DIR_NAME = 'sessions'
 DEFAULT_SESSIONS_DIR = DEFAULT_CONFIG_DIR / SESSIONS_DIR_NAME
@@ -26,27 +34,89 @@
 # <https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Requests>
 SESSION_IGNORED_HEADER_PREFIXES = ['Content-', 'If-']
 
+# Cookie related options
+KEPT_COOKIE_OPTIONS = ['name', 'expires', 'path', 'value', 'domain', 'secure']
+DEFAULT_COOKIE_PATH = '/'
+
+
+def is_anonymous_session(session_name: str) -> bool:
+    return os.path.sep in session_name
+
+
+def session_hostname_to_dirname(hostname: str, session_name: str) -> str:
+    # host:port => host_port
+    hostname = hostname.replace(':', '_')
+    return os.path.join(
+        SESSIONS_DIR_NAME,
+        hostname,
+        f'{session_name}.json'
+    )
+
+
+def strip_port(hostname: str) -> str:
+    return hostname.split(':')[0]
+
+
+def materialize_cookie(cookie: Cookie) -> Dict[str, Any]:
+    materialized_cookie = {
+        option: getattr(cookie, option)
+        for option in KEPT_COOKIE_OPTIONS
+    }
+
+    if (
+        cookie._rest.get('is_explicit_none')
+        and materialized_cookie['domain'] == ''
+    ):
+        materialized_cookie['domain'] = None
+
+    return materialized_cookie
+
+
+def materialize_cookies(jar: RequestsCookieJar) -> List[Dict[str, Any]]:
+    return [
+        materialize_cookie(cookie)
+        for cookie in jar
+    ]
+
+
+def materialize_headers(headers: Dict[str, str]) -> List[Dict[str, Any]]:
+    return [
+        {
+            'name': name,
+            'value': value
+        }
+        for name, value in headers.copy().items()
+    ]
+
 
 def get_httpie_session(
+    env: Environment,
     config_dir: Path,
     session_name: str,
     host: Optional[str],
     url: str,
+    *,
+    suppress_legacy_warnings: bool = False
 ) -> 'Session':
-    if os.path.sep in session_name:
+    bound_hostname = host or url_as_host(url)
+    if not bound_hostname:
+        # HACK/FIXME: httpie-unixsocket's URLs have no hostname.
+        bound_hostname = 'localhost'
+
+    if is_anonymous_session(session_name):
         path = os.path.expanduser(session_name)
+        session_id = path
     else:
-        hostname = host or urlsplit(url).netloc.split('@')[-1]
-        if not hostname:
-            # HACK/FIXME: httpie-unixsocket's URLs have no hostname.
-            hostname = 'localhost'
-
-        # host:port => host_port
-        hostname = hostname.replace(':', '_')
-        path = (
-            config_dir / SESSIONS_DIR_NAME / hostname / f'{session_name}.json'
-        )
-    session = Session(path)
+        path = config_dir / session_hostname_to_dirname(bound_hostname, session_name)
+        session_id = session_name
+
+    session = Session(
+        path,
+        env=env,
+        session_id=session_id,
+        bound_host=strip_port(bound_hostname),
+        suppress_legacy_warnings=suppress_legacy_warnings
+    )
     session.load()
     return session
 
@@ -55,28 +125,85 @@ class Session(BaseConfigDict):
     helpurl = 'https://httpie.io/docs#sessions'
     about = 'HTTPie session file'
 
-    def __init__(self, path: Union[str, Path]):
+    def __init__(
+        self,
+        path: Union[str, Path],
+        env: Environment,
+        bound_host: str,
+        session_id: str,
+        suppress_legacy_warnings: bool = False,
+    ):
         super().__init__(path=Path(path))
-        self['headers'] = {}
-        self['cookies'] = {}
+
+        # Default values for the session files
+        self['headers'] = []
+        self['cookies'] = []
         self['auth'] = {
             'type': None,
             'username': None,
             'password': None
         }
 
-    def update_headers(self, request_headers: HTTPHeadersDict):
-        """
-        Update the session headers with the request ones while ignoring
-        certain name prefixes.
+        # Runtime state of the Session objects.
+        self.env = env
+        self._headers = HTTPHeadersDict()
+        self.cookie_jar = RequestsCookieJar(
+            # See also a temporary workaround for a Requests bug in `compat.py`.
+            policy=HTTPieCookiePolicy(),
+        )
+        self.session_id = session_id
+        self.bound_host = bound_host
+        self.suppress_legacy_warnings = suppress_legacy_warnings
 
-        """
-        headers = self.headers
-        for name, value in request_headers.copy().items():
+    def _add_cookies(self, cookies: List[Dict[str, Any]]) -> None:
+        for cookie in cookies:
+            domain = cookie.get('domain', '')
+            if domain is None:
+                # domain = None means explicitly lack of cookie, though
+                # requests requires domain to be a string so we'll cast it
+                # manually.
+                cookie['domain'] = ''
+                cookie['rest'] = {'is_explicit_none': True}
+
+            self.cookie_jar.set(**cookie)
 
+    def pre_process_data(self, data: Dict[str, Any]) -> Dict[str, Any]:
+        for key, deserializer, importer in [
+            ('cookies', legacy_cookies.pre_process, self._add_cookies),
+            ('headers', legacy_headers.pre_process, self._headers.update),
+        ]:
+            values = data.get(key)
+            if values:
+                normalized_values = deserializer(self, values)
+            else:
+                normalized_values = []
+
+            importer(normalized_values)
+
+        return data
+
+    def post_process_data(self, data: Dict[str, Any]) -> Dict[str, Any]:
+        for key, store, serializer, exporter in [
+            ('cookies', self.cookie_jar, materialize_cookies, legacy_cookies.post_process),
+            ('headers', self._headers, materialize_headers, legacy_headers.post_process),
+        ]:
+            original_type = type(data.get(key))
+            values = serializer(store)
+
+            data[key] = exporter(
+                values,
+                original_type=original_type
+            )
+
+        return data
+
+    def _compute_new_headers(self, request_headers: HTTPHeadersDict) -> HTTPHeadersDict:
+        new_headers = HTTPHeadersDict()
+        for name, value in request_headers.copy().items():
             if value is None:
                 continue  # Ignore explicitly unset headers
 
+            original_value = value
             if type(value) is not str:
                 value = value.decode()
 
@@ -85,41 +212,62 @@ def update_headers(self, request_headers: HTTPHeadersDict):
 
             if name.lower() == 'cookie':
                 for cookie_name, morsel in SimpleCookie(value).items():
-                    self['cookies'][cookie_name] = {'value': morsel.value}
-                del request_headers[name]
+                    if not morsel['path']:
+                        morsel['path'] = DEFAULT_COOKIE_PATH
+                    self.cookie_jar.set(cookie_name, morsel)
+
+                request_headers.remove_item(name, original_value)
                 continue
 
             for prefix in SESSION_IGNORED_HEADER_PREFIXES:
                 if name.lower().startswith(prefix.lower()):
                     break
             else:
-                headers[name] = value
+                new_headers.add(name, value)
+
+        return new_headers
+
+    def update_headers(self, request_headers: HTTPHeadersDict):
+        """
+        Update the session headers with the request ones while ignoring
+        certain name prefixes.
+
+        """
+
+        new_headers = self._compute_new_headers(request_headers)
+        new_keys = new_headers.copy().keys()
+
+        # New headers will take priority over the existing ones, and override
+        # them directly instead of extending them.
+        for key, value in self._headers.copy().items():
+            if key in new_keys:
+                continue
+
+            new_headers.add(key, value)
 
-        self['headers'] = dict(headers)
+        self._headers = new_headers
 
     @property
     def headers(self) -> HTTPHeadersDict:
-        return HTTPHeadersDict(self['headers'])
+        return self._headers.copy()
 
     @property
     def cookies(self) -> RequestsCookieJar:
-        jar = RequestsCookieJar()
-        for name, cookie_dict in self['cookies'].items():
-            jar.set_cookie(create_cookie(
-                name, cookie_dict.pop('value'), **cookie_dict))
-        jar.clear_expired_cookies()
-        return jar
+        self.cookie_jar.clear_expired_cookies()
+        return self.cookie_jar
 
     @cookies.setter
     def cookies(self, jar: RequestsCookieJar):
-        # <https://docs.python.org/3/library/cookielib.html#cookie-objects>
-        stored_attrs = ['value', 'path', 'secure', 'expires']
-        self['cookies'] = {}
-        for cookie in jar:
-            self['cookies'][cookie.name] = {
-                attname: getattr(cookie, attname)
-                for attname in stored_attrs
-            }
+        self.cookie_jar = jar
+
+    def remove_cookies(self, cookies: List[Dict[str, str]]):
+        for cookie in cookies:
+            remove_cookie_by_name(
+                self.cookie_jar,
+                cookie['name'],
+                domain=cookie.get('domain', None),
+                path=cookie.get('path', None)
+            )
 
     @property
     def auth(self) -> Optional[AuthBase]:
@@ -155,7 +303,20 @@ def auth(self, auth: dict):
         assert {'type', 'raw_auth'} == auth.keys()
         self['auth'] = auth
 
-    def remove_cookies(self, names: Iterable[str]):
-        for name in names:
-            if name in self['cookies']:
-                del self['cookies'][name]
+    @property
+    def is_anonymous(self):
+        return is_anonymous_session(self.session_id)
+
+    def warn_legacy_usage(self, warning: str) -> None:
+        if self.suppress_legacy_warnings:
+            return None
+
+        self.env.log_error(
+            warning,
+            level=LogLevel.WARNING
+        )
+
+        # We don't want to spam multiple warnings on each usage,
+        # so if there is already a warning for the legacy usage
+        # we'll skip the next ones.
+        self.suppress_legacy_warnings = True
diff --git a/httpie/ssl_.py b/httpie/ssl_.py
index cdec18f87b..6b3ef38cf6 100644
--- a/httpie/ssl_.py
+++ b/httpie/ssl_.py
@@ -1,14 +1,16 @@
 import ssl
+from typing import NamedTuple, Optional
 
-from httpie.adapters import HTTPAdapter
 # noinspection PyPackageRequirements
 from urllib3.util.ssl_ import (
-    DEFAULT_CIPHERS, create_urllib3_context,
+    create_urllib3_context,
     resolve_ssl_version,
 )
 
+from .adapters import HTTPAdapter
+from .compat import ensure_default_certs_loaded
+
 
-DEFAULT_SSL_CIPHERS = DEFAULT_CIPHERS
 SSL_VERSION_ARG_MAPPING = {
     'ssl2.3': 'PROTOCOL_SSLv23',
     'ssl3': 'PROTOCOL_SSLv3',
@@ -24,6 +26,17 @@
 }
 
 
+class HTTPieCertificate(NamedTuple):
+    cert_file: Optional[str] = None
+    key_file: Optional[str] = None
+    key_password: Optional[str] = None
+
+    def to_raw_cert(self):
+        """Synthesize a requests-compatible (2-item tuple of cert and key file)
+        object from HTTPie's internal representation of a certificate."""
+        return self.cert_file, self.key_file
+
+
 class HTTPieHTTPSAdapter(HTTPAdapter):
     def __init__(
         self,
@@ -47,13 +60,20 @@ def proxy_manager_for(self, *args, **kwargs):
         kwargs['ssl_context'] = self._ssl_context
         return super().proxy_manager_for(*args, **kwargs)
 
+    def cert_verify(self, conn, url, verify, cert):
+        if isinstance(cert, HTTPieCertificate):
+            conn.key_password = cert.key_password
+            cert = cert.to_raw_cert()
+
+        return super().cert_verify(conn, url, verify, cert)
+
     @staticmethod
     def _create_ssl_context(
         verify: bool,
         ssl_version: str = None,
         ciphers: str = None,
     ) -> 'ssl.SSLContext':
-        return create_urllib3_context(
+        ssl_context = create_urllib3_context(
             ciphers=ciphers,
             ssl_version=resolve_ssl_version(ssl_version),
             # Since we are using a custom SSL context, we need to pass this
@@ -61,3 +81,29 @@ def _create_ssl_context(
             # in `super().cert_verify()`.
             cert_reqs=ssl.CERT_REQUIRED if verify else ssl.CERT_NONE
         )
+        ensure_default_certs_loaded(ssl_context)
+        return ssl_context
+
+    @classmethod
+    def get_default_ciphers_names(cls):
+        return [cipher['name'] for cipher in cls._create_ssl_context(verify=False).get_ciphers()]
+
+
+def _is_key_file_encrypted(key_file):
+    """Detects if a key file is encrypted or not.
+
+    Copy of the internal urllib function (urllib3.util.ssl_)"""
+
+    with open(key_file, "r") as f:
+        for line in f:
+            # Look for Proc-Type: 4,ENCRYPTED
+            if "ENCRYPTED" in line:
+                return True
+
+    return False
+
+
+# We used to import the default set of TLS ciphers from urllib3, but they removed it.
+# Instead, now urllib3 uses the list of ciphers configured by the system.
+# <https://github.com/httpie/cli/pull/1501>
+DEFAULT_SSL_CIPHERS_STRING = ':'.join(HTTPieHTTPSAdapter.get_default_ciphers_names())
diff --git a/httpie/uploads.py b/httpie/uploads.py
index 4fdb79222d..4a993b3a25 100644
--- a/httpie/uploads.py
+++ b/httpie/uploads.py
@@ -2,6 +2,7 @@
 import os
 import zlib
 import functools
+import threading
 from typing import Any, Callable, IO, Iterable, Optional, Tuple, Union, TYPE_CHECKING
 from urllib.parse import urlencode
 
@@ -22,12 +23,20 @@ def __iter__(self) -> Iterable[Union[str, bytes]]:
 
 
 class ChunkedUploadStream(ChunkedStream):
-    def __init__(self, stream: Iterable, callback: Callable):
+    def __init__(
+        self,
+        stream: Iterable,
+        callback: Callable,
+        event: Optional[threading.Event] = None
+    ) -> None:
         self.callback = callback
         self.stream = stream
+        self.event = event
 
     def __iter__(self) -> Iterable[Union[str, bytes]]:
         for chunk in self.stream:
+            if self.event:
+                self.event.set()
             self.callback(chunk)
             yield chunk
 
@@ -35,12 +44,19 @@ def __iter__(self) -> Iterable[Union[str, bytes]]:
 class ChunkedMultipartUploadStream(ChunkedStream):
     chunk_size = 100 * 1024
 
-    def __init__(self, encoder: 'MultipartEncoder'):
+    def __init__(
+        self,
+        encoder: 'MultipartEncoder',
+        event: Optional[threading.Event] = None
+    ) -> None:
         self.encoder = encoder
+        self.event = event
 
     def __iter__(self) -> Iterable[Union[str, bytes]]:
         while True:
             chunk = self.encoder.read(self.chunk_size)
+            if self.event:
+                self.event.set()
             if not chunk:
                 break
             yield chunk
@@ -77,10 +93,10 @@ def is_stdin(file: IO) -> bool:
         return file_no == sys.stdin.fileno()
 
 
-READ_THRESHOLD = float(os.getenv("HTTPIE_STDIN_READ_WARN_THRESHOLD", 10.0))
+READ_THRESHOLD = float(os.getenv('HTTPIE_STDIN_READ_WARN_THRESHOLD', 10.0))
 
 
-def observe_stdin_for_data_thread(env: Environment, file: IO) -> None:
+def observe_stdin_for_data_thread(env: Environment, file: IO, read_event: threading.Event) -> None:
     # Windows unfortunately does not support select() operation
     # on regular files, like stdin in our use case.
     # https://docs.python.org/3/library/select.html#select.select
@@ -92,24 +108,41 @@ def observe_stdin_for_data_thread(env: Environment, file: IO) -> None:
     if READ_THRESHOLD == 0:
         return None
 
-    import select
-    import threading
-
-    def worker():
-        can_read, _, _ = select.select([file], [], [], READ_THRESHOLD)
-        if not can_read:
+    def worker(event: threading.Event) -> None:
+        if not event.wait(timeout=READ_THRESHOLD):
             env.stderr.write(
                 f'> warning: no stdin data read in {READ_THRESHOLD}s '
                 f'(perhaps you want to --ignore-stdin)\n'
                 f'> See: https://httpie.io/docs/cli/best-practices\n'
             )
 
+    # Making it a daemon ensures that if the user exits from the main program
+    # (e.g. either regularly or with Ctrl-C), the thread will not
+    # block them.
     thread = threading.Thread(
-        target=worker
+        target=worker,
+        args=(read_event,),
+        daemon=True
     )
     thread.start()
 
 
+def _read_file_with_selectors(file: IO, read_event: threading.Event) -> bytes:
+    if is_windows or not is_stdin(file):
+        return as_bytes(file.read())
+
+    import select
+
+    # Try checking whether there is any incoming data for READ_THRESHOLD
+    # seconds. If there isn't anything in the given period, issue
+    # a warning about a misusage.
+    read_selectors, _, _ = select.select([file], [], [], READ_THRESHOLD)
+    if read_selectors:
+        read_event.set()
+
+    return as_bytes(file.read())
+
+
 def _prepare_file_for_upload(
     env: Environment,
     file: Union[IO, 'MultipartEncoder'],
@@ -117,9 +150,11 @@ def _prepare_file_for_upload(
     chunked: bool = False,
     content_length_header_value: Optional[int] = None,
 ) -> Union[bytes, IO, ChunkedStream]:
+    read_event = threading.Event()
     if not super_len(file):
         if is_stdin(file):
-            observe_stdin_for_data_thread(env, file)
+            observe_stdin_for_data_thread(env, file, read_event)
+
         # Zero-length -> assume stdin.
         if content_length_header_value is None and not chunked:
             # Read the whole stdin to determine `Content-Length`.
@@ -129,7 +164,7 @@ def _prepare_file_for_upload(
             #   something like --no-chunked.
             #   This would be backwards-incompatible so wait until v3.0.0.
             #
-            file = as_bytes(file.read())
+            file = _read_file_with_selectors(file, read_event)
     else:
         file.read = _wrap_function_with_callback(
             file.read,
@@ -141,11 +176,13 @@ def _prepare_file_for_upload(
         if isinstance(file, MultipartEncoder):
             return ChunkedMultipartUploadStream(
                 encoder=file,
+                event=read_event,
             )
         else:
             return ChunkedUploadStream(
                 stream=file,
                 callback=callback,
+                event=read_event
             )
     else:
         return file
diff --git a/httpie/utils.py b/httpie/utils.py
index fa19fa7cde..4735b2be5d 100644
--- a/httpie/utils.py
+++ b/httpie/utils.py
@@ -1,15 +1,20 @@
+import os
+import base64
 import json
 import mimetypes
 import re
 import sys
 import time
+import tempfile
 import sysconfig
 
 from collections import OrderedDict
+from contextlib import contextmanager
 from http.cookiejar import parse_ns_headers
 from pathlib import Path
 from pprint import pformat
-from typing import Any, List, Optional, Tuple, Callable, Iterable, TypeVar
+from urllib.parse import urlsplit
+from typing import Any, List, Optional, Tuple, Generator, Callable, Iterable, IO, TypeVar
 
 import requests.auth
 
@@ -213,15 +218,34 @@ def parse_content_type_header(header):
     return content_type, params_dict
 
 
-def as_site(path: Path) -> Path:
+def as_site(path: Path, **extra_vars) -> Path:
     site_packages_path = sysconfig.get_path(
         'purelib',
-        vars={'base': str(path)}
+        vars={'base': str(path), **extra_vars}
     )
     return Path(site_packages_path)
 
 
-def split(iterable: Iterable[T], key: Callable[[T], bool]) -> Tuple[List[T], List[T]]:
+def get_site_paths(path: Path) -> Iterable[Path]:
+    from httpie.compat import (
+        MIN_SUPPORTED_PY_VERSION,
+        MAX_SUPPORTED_PY_VERSION,
+        is_frozen
+    )
+
+    if is_frozen:
+        [major, min_minor] = MIN_SUPPORTED_PY_VERSION
+        [major, max_minor] = MAX_SUPPORTED_PY_VERSION
+        for minor in range(min_minor, max_minor + 1):
+            yield as_site(
+                path,
+                py_version_short=f'{major}.{minor}'
+            )
+    else:
+        yield as_site(path)
+
+
+def split_iterable(iterable: Iterable[T], key: Callable[[T], bool]) -> Tuple[List[T], List[T]]:
     left, right = [], []
     for item in iterable:
         if key(item):
@@ -237,3 +261,49 @@ def unwrap_context(exc: Exception) -> Optional[Exception]:
         return unwrap_context(context)
     else:
         return exc
+
+
+def url_as_host(url: str) -> str:
+    return urlsplit(url).netloc.split('@')[-1]
+
+
+class LockFileError(ValueError):
+    pass
+
+
+@contextmanager
+def open_with_lockfile(file: Path, *args, **kwargs) -> Generator[IO[Any], None, None]:
+    file_id = base64.b64encode(os.fsencode(file)).decode()
+    target_file = Path(tempfile.gettempdir()) / file_id
+
+    # Have an atomic-like touch here, so we'll tighten the possibility of
+    # a race occurring between multiple processes accessing the same file.
+    try:
+        target_file.touch(exist_ok=False)
+    except FileExistsError as exc:
+        raise LockFileError("Can't modify a locked file.") from exc
+
+    try:
+        with open(file, *args, **kwargs) as stream:
+            yield stream
+    finally:
+        target_file.unlink()
+
+
+def is_version_greater(version_1: str, version_2: str) -> bool:
+    # In an ideal scenario, we would depend on `packaging` in order
+    # to offer PEP 440 compatible parsing. But since it might not be
+    # commonly available for outside packages, and since we are only
+    # going to parse HTTPie's own version it should be fine to compare
+    # this in a SemVer subset fashion.
+
+    def split_version(version: str) -> Tuple[int, ...]:
+        parts = []
+        for part in version.split('.')[:3]:
+            try:
+                parts.append(int(part))
+            except ValueError:
+                break
+        return tuple(parts)
+
+    return split_version(version_1) > split_version(version_2)
diff --git a/pytest.ini b/pytest.ini
index 7c6209701b..ced65979b1 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,3 +1,7 @@
 [pytest]
 markers =
+    # If you want to run tests without a full HTTPie installation
+    # we advise you to disable the markers below, e.g:
+    # pytest -m 'not requires_installation and not requires_external_processes'
     requires_installation
+    requires_external_processes
diff --git a/setup.cfg b/setup.cfg
index 2deb39a788..85490981aa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 # Please keep all characters in this file in ASCII
 # distutils uses system's locale to interpret it and not everybody
-# uses UTF-8. See https://github.com/httpie/httpie/issues/1039
+# uses UTF-8. See https://github.com/httpie/cli/issues/1039
 # for an example
 [wheel]
 
@@ -12,9 +12,99 @@ norecursedirs = tests/fixtures
 addopts = --tb=native --doctest-modules --verbose
 xfail_strict = True
 
+[metadata]
+name = httpie
+version = attr: httpie.__version__
+author = Jakub Roztocil
+author_email = jakub@roztocil.co
+license = BSD
+description = HTTPie: modern, user-friendly command-line HTTP client for the API era.
+url = https://httpie.io/
+long_description = file: README.md
+long_description_content_type = text/markdown
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Programming Language :: Python
+    Programming Language :: Python :: 3 :: Only
+    Environment :: Console
+    Intended Audience :: Developers
+    Intended Audience :: System Administrators
+    License :: OSI Approved :: BSD License
+    Topic :: Internet :: WWW/HTTP
+    Topic :: Software Development
+    Topic :: System :: Networking
+    Topic :: Terminals
+    Topic :: Text Processing
+    Topic :: Utilities
+project_urls =
+    GitHub = https://github.com/httpie/cli
+    Twitter = https://twitter.com/httpie
+    Discord = https://httpie.io/discord
+    Documentation = https://httpie.io/docs
+    Online Demo = https://httpie.io/run
+
+
+[options]
+packages = find:
+install_requires =
+    pip
+    charset_normalizer>=2.0.0
+    defusedxml>=0.6.0
+    requests[socks] >=2.22.0
+    Pygments>=2.5.2
+    requests-toolbelt>=0.9.1
+    multidict>=4.7.0
+    setuptools
+    importlib-metadata>=1.4.0; python_version<"3.8"
+    rich>=9.10.0
+    colorama>=0.2.4; sys_platform=="win32"
+python_requires = >=3.7
+
 
 [flake8]
 # <https://flake8.pycqa.org/en/latest/user/error-codes.html>
 # E501 - line too long
 # W503 - line break before binary operator
 ignore = E501,W503
+
+[options.packages.find]
+include =
+    httpie
+    httpie.*
+
+[options.entry_points]
+console_scripts =
+    http = httpie.__main__:main
+    https = httpie.__main__:main
+    httpie = httpie.manager.__main__:main
+
+[options.extras_require]
+dev =
+    pytest
+    pytest-httpbin>=0.0.6
+    responses
+    pytest-mock
+    werkzeug<2.1.0
+    flake8
+    flake8-comprehensions
+    flake8-deprecated
+    flake8-mutable
+    flake8-tuple
+    pyopenssl
+    pytest-cov
+    pyyaml
+    twine
+    wheel
+    Jinja2
+test =
+    pytest
+    pytest-httpbin>=0.0.6
+    responses
+    pytest-mock
+    werkzeug<2.1.0
+
+[options.data_files]
+share/man/man1 =
+    extras/man/http.1
+    extras/man/https.1
+    extras/man/httpie.1
diff --git a/setup.py b/setup.py
index 5316ff73d3..606849326a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,112 +1,3 @@
-# This is purely the result of trial and error.
+from setuptools import setup
 
-import sys
-
-from setuptools import setup, find_packages
-
-import httpie
-
-
-# Note: keep requirements here to ease distributions packaging
-tests_require = [
-    'pytest',
-    'pytest-httpbin>=0.0.6',
-    'responses',
-]
-dev_require = [
-    *tests_require,
-    'flake8',
-    'flake8-comprehensions',
-    'flake8-deprecated',
-    'flake8-mutable',
-    'flake8-tuple',
-    'pyopenssl',
-    'pytest-cov',
-    'pyyaml',
-    'twine',
-    'wheel',
-    'Jinja2'
-]
-install_requires = [
-    'charset_normalizer>=2.0.0',
-    'defusedxml>=0.6.0',
-    'requests[socks]>=2.22.0',
-    'Pygments>=2.5.2',
-    'requests-toolbelt>=0.9.1',
-    'multidict>=4.7.0',
-    'setuptools',
-    'importlib-metadata>=1.4.0; python_version < "3.8"',
-]
-install_requires_win_only = [
-    'colorama>=0.2.4',
-]
-
-# Conditional dependencies:
-
-# sdist
-if 'bdist_wheel' not in sys.argv:
-
-    if 'win32' in str(sys.platform).lower():
-        # Terminal colors for Windows
-        install_requires.extend(install_requires_win_only)
-
-
-# bdist_wheel
-extras_require = {
-    'dev': dev_require,
-    'test': tests_require,
-    # https://wheel.readthedocs.io/en/latest/#defining-conditional-dependencies
-    ':sys_platform == "win32"': install_requires_win_only,
-}
-
-
-def long_description():
-    with open('README.md', encoding='utf-8') as f:
-        return f.read()
-
-
-setup(
-    name='httpie',
-    version=httpie.__version__,
-    description=httpie.__doc__.strip(),
-    long_description=long_description(),
-    long_description_content_type='text/markdown',
-    url='https://httpie.io/',
-    download_url=f'https://github.com/httpie/httpie/archive/{httpie.__version__}.tar.gz',
-    author=httpie.__author__,
-    author_email='jakub@roztocil.co',
-    license=httpie.__licence__,
-    packages=find_packages(include=['httpie', 'httpie.*']),
-    entry_points={
-        'console_scripts': [
-            'http = httpie.__main__:main',
-            'https = httpie.__main__:main',
-            'httpie = httpie.manager.__main__:main',
-        ],
-    },
-    python_requires='>=3.7',
-    extras_require=extras_require,
-    install_requires=install_requires,
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3 :: Only',
-        'Environment :: Console',
-        'Intended Audience :: Developers',
-        'Intended Audience :: System Administrators',
-        'License :: OSI Approved :: BSD License',
-        'Topic :: Internet :: WWW/HTTP',
-        'Topic :: Software Development',
-        'Topic :: System :: Networking',
-        'Topic :: Terminals',
-        'Topic :: Text Processing',
-        'Topic :: Utilities'
-    ],
-    project_urls={
-        'GitHub': 'https://github.com/httpie/httpie',
-        'Twitter': 'https://twitter.com/httpie',
-        'Discord': 'https://httpie.io/discord',
-        'Documentation': 'https://httpie.io/docs',
-        'Online Demo': 'https://httpie.io/run',
-    },
-)
+setup()
diff --git a/snapcraft.yaml b/snapcraft.yaml
index eb620c0e16..1d9246a400 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -31,7 +31,7 @@ description: |
   Links
     - Documentation: https://httpie.io/docs
     - Try in browser: https://httpie.io/run
-    - GitHub: https://github.com/httpie/httpie
+    - GitHub: https://github.com/httpie/cli
     - Twitter: https://twitter.com/httpie
     - Discord: https://httpie.io/chat
 license: BSD-3-Clause-LBNL
diff --git a/tests/README.md b/tests/README.md
index d3e460914e..75d2a2a867 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -1,3 +1,3 @@
 # HTTPie Test Suite
 
-Please see [CONTRIBUTING](https://github.com/httpie/httpie/blob/master/CONTRIBUTING.md) for contribution and testing guidelines.
+Please see [CONTRIBUTING](https://github.com/httpie/cli/blob/master/CONTRIBUTING.md) for contribution and testing guidelines.
diff --git a/tests/client_certs/password_protected/client.key b/tests/client_certs/password_protected/client.key
new file mode 100644
index 0000000000..1634352f90
--- /dev/null
+++ b/tests/client_certs/password_protected/client.key
@@ -0,0 +1,42 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-128-CBC,93DA845817852FB576163AA829C232E9
+
+VauvxiyC0lQbLJFoEGlnIIZO2/+b66DjTwSccqSdVg+Zaxvbc0jeVhS43SQ01ft0
+hB/oISgJB/1I/oKbGwx07T9j78Q8G9AxQV6hzvozK5Etjew4RrvV4DYyOSzwZNQr
+qB9S0qhBKyemA2vx4aH/8nazHh+zrRD3y0oMbuCHLxSGuqncNXIKCTYgMb8NUucJ
+fEArYHijZ0iotoOEpP31JOUPCpKhEewQxzNK0HLws0lv6nl6fmBlkdi603qmsG5U
+uinuiGodrh9SpCUc/A4OhVWKwoiQSxGnz+SiNaXyUByf9CR8RLPWqi5pTGHC8xrJ
+uHI6Cw8ZfrJ2clYtuCWv6g6c4F7sz6eAJHqCZNnU32kKu3uH/9E/7Z8uH7JOVyFa
+9DlBHCWHdyaHs8mY+/pDcxeMyWeC837sBelIBF1iEwU/sMw43HipZBNhrekMLAkx
+y5HRYQDstTvk1Nvj8fKysYuhGCiF/V6PWYo5RaQszZLhS+uyFEBwa0ojYNZh4LyB
+5uIdBaqtL9FD4RXqTYfN96eEyoYaUUY5KXqQMZkuZpotGYmH9OGMTVCgR7eU0a62
+dgbQw4UCQd4YTNx1PyboH72oIi+Rqp2LEYEQSHP/dIUtBiA/kmWhgapZVGvfJ+fF
+u9MPgPUDvH3oLVm4Mr+biLX/oUQVEup85q8++E2csDe2HoC4JdmJ0D9rZM2OqpYV
+YZAPcPhx2pYnK5d6RvMFwtLPNfHxgYQXMVg6BFtu5GCxxqr+dhF7TGrN5s6AKC8U
+bkVQIXwO8bYVTLj2Sb44fe+Xl1X/09yHnkZC0u/Kb2KvUm7Gnltn3tUmj7fGI0I6
+aI6G3T1xc0jz9WhjdnM3uDYYI66GpgRgv81n7IkfRjclNArW4OStf30K4pXXjGeP
+vgopPJ1yNpaM4QNbx3cqzP0eBy+Ss7aCXca4I3BzjXtuo9ZcEzGb+1FkS7ASEdex
+cAroJOmm9KJ+3KOxsVs5fxXtQqzzeD8cdZeGV0eckJNfjWSBH2zyhaxwdlCvG1I9
+dTvdd6q31FjlnUq9SvGEkfoy4myIUtt4DJQ4lSktvKQv9qepUjoX0k3xipgSmiPO
+yxE+VdJdJ9/tDUf3psD01XLIss7hOX9aED3svN3uXB2ZVCSH6e2l4IrBMirdKNwR
+fB4Yrul0qt9knmn11p2aWav055hb1Il5Tm8/WnaXkgtr20zP4RgR7P19mSjTBxUm
+7iUIiWqU43Sx2LWsYpg7Lbj5XGLcvxv5WjYsE4Km0ltZCLKzMHfQ76qv4ZOQkHcR
+9UevRmzU45095eASztedrYyxDNwU6YSdUcOYTP6383G9azbStlQY+w2Em++UoNoH
+3eYj6KHKx+hkZOdc8PLaLg2f98jOiADpKYJTGnkKoLjTCfr9nzBeNxwRCQ4F4vO/
++tuRo3i1ODpJQbbZys9Mz+9PSwBH31UAib0+v0GYLDJN2rJcyGal/0DH5zON9Ogi
+5bZQ9oS91p9K5hUAnHpd3zOzeX1lCoZnmtOI8wah79SVSpK1xoE6BAxAHfRiYiS3
+1tDmkThJBOGXmkpLjtgNW3MqYKBnO3tRzrDDCjTKi5jFX/SD2FPpExOyA2+I0lrr
+a9b+Sjbl1Z7B1yZmmTGMKB7prwK00LaF6yqKOhE+bx1yJAaWrbdPCD6vDmbq5YV6
+87woIiA16Q2I1x77/Kg3TDO9LMDiwI5BFyjR+4Q5SvufIaxtsmTBuaBuPif+f4DT
+MPQcfk5ozQIKY4qiSqMAOXAf2t+/UQROjgYvayRz0fOv2rV0vS4i9ELj/8Dn65Dq
+7aQzLwM0psToGIVyzAV+hF3jeQP+Xu7VjtSxTJ+ajz7PeIXeBH/mwJKMk7hpRwGj
+4fZ92S00Iat2kA6wn55u6EGewgcaQrN2zr75a9gvXQwMDmsjszq2uWWxxJg6pAPZ
+rNqhM9tJ2UAJ1lLZzUDfhK4wU4pGWIhT+BmdDgJ40hI4b1WEmKSTxsj8AYNcVDRf
+i2Ox1QhZQX9bH5kTOX373/6cALFR5DcU8qh2FJtf+3uiZHNloEeID//H2Gdoxz0Y
+5CC/VDiIa4Gj4D+ATsLMgTDt4eUOinMeC1H6w+QBd9UvceqEvrgu+1WB8UCK/Hm/
+7fZ0srsGg/WRqdSuO8/7998PEHgP8+wnTbxi9Y3EEbkaKUL6esJfeOjBibuGPyaf
+2Y9QLcpVKaD7pmVeb97qExZZjEiID6QYmFUO8j0koS2fki0l+z8XEZ3JLZKa9XS+
+uiMPQKg41j+9ZrGmwPNj7brjwA0cdSb4CLgxg4FwuwB660XaXpW3aRsiRryi0YcM
+hn2l6b4JgBz8gUkFiTXQ8wRvAKDC1hUkUysqCAC+Yg3cWxlDZVeSeqVGr5jhHgN1
+-----END RSA PRIVATE KEY-----
diff --git a/tests/client_certs/password_protected/client.pem b/tests/client_certs/password_protected/client.pem
new file mode 100644
index 0000000000..08ee652254
--- /dev/null
+++ b/tests/client_certs/password_protected/client.pem
@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIEazCCAtOgAwIBAgIUIWojJySwCenyvcJrZY1aKOMQfTUwDQYJKoZIhvcNAQEL
+BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMjAzMDExMzM5MzRaFw00OTA3
+MTcxMzM5MzRaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggGiMA0GCSqGSIb3DQEB
+AQUAA4IBjwAwggGKAoIBgQC0+8GOIhknLgLmWEQGgdDJffntbDfGdtG7JFUFfvuN
+sibTHL4RPNhe+UrT/LR+JBfIfmdeb+NlmKzsTeR0+8PkX5ZjXMShf5icghVukK7G
+OoQS7olQqlGzpIX76VqktVr4tFNXmMJeBO0NIaXHm0ASsoz3fIfDx9ttJETPs6lm
+Wv/PUPemvtUgcbAb+kjz9QqcUV8B1xcCvQma6NSpxcmJHqAuI6HkdbDzyedKuuSi
+M6yNFjh3EJjsufReQgkcfDsqh+RA3zQoIyPXLNqjzGD71z24jUtvIxb5ZNEtv0xp
+5zCOCavuRNNyKGvvnlIeyup7bMe0QIds566miG49osVpPVvVmg+q+w2YYAE+7svb
+nJp7NYn2tryRqsmvnASLVQD6T9wTWUa8w/tT1+ltnhfqbwDcVACzsw/U4FFwcfWw
+5BnUcJacoDkj/3TCqgkA8XFe1/DVU8XCcsvEaoLzwHhHu2+QDpqal8rNouyTpFGA
+/wioVBQGpksPZjl8lumsz3kCAwEAAaNTMFEwHQYDVR0OBBYEFGJhl1BPOXCVqRo3
+U/ruuedvlDqsMB8GA1UdIwQYMBaAFGJhl1BPOXCVqRo3U/ruuedvlDqsMA8GA1Ud
+EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggGBAE9NtrE5qSHlK9DXdH6bPW6z
+GO9uWBl3rJVtqVvPoH8RxJG/jtaD/Pnc3MkIxMoliCleNK6BdYVGV9u8x9W1jQo8
+H+mnH3/Ise8ZY1zpblZJF0z9xs5sWW7qO8U06GmJWRSPn3LKEZjLsNmThhUW09wN
+8EZX914zCWtzCrUTNg8Au1Dz9zA9ScfpCVPhKORTCnrpoTL6iXsPxmCx+5awmNLE
+uh9kw4NScEyq33RTPosMpwSMlXGRuASltx/J7Rn0DNR0r1p0XzDS4CG1iDwXHlEF
+MwsOvSahNyz5RInrU3cgN70tafoRIHScLYycnRml8dydxrDoFgdJk5sI4zgq24Sg
+TktTq9ShrT4yQX+lrGS6eZQK/YZEBPD7BdTLYp3vlfYQMJ4Jz9SyQ8b9/9jIFVFS
+dFfWiCqEuhTvGfptAzYX+K9OaegZnIk3X7R6O+YQ3oHCbLbnV3bpKlgNnOKBwa2X
+kJ5GRp+rZOJ97yjrspKjpR5tNCiJnp7NnnA5VA6mfw==
+-----END CERTIFICATE-----
diff --git a/tests/conftest.py b/tests/conftest.py
index 5e8c511072..551a636789 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,11 +1,17 @@
-import os
 import socket
 
 import pytest
 from pytest_httpbin import certs
-
-from .utils import HTTPBIN_WITH_CHUNKED_SUPPORT_DOMAIN, HTTPBIN_WITH_CHUNKED_SUPPORT
-from .utils.plugins_cli import ( # noqa
+from pytest_httpbin.serve import Server as PyTestHttpBinServer
+
+from .utils import (  # noqa
+    HTTPBIN_WITH_CHUNKED_SUPPORT_DOMAIN,
+    HTTPBIN_WITH_CHUNKED_SUPPORT,
+    REMOTE_HTTPBIN_DOMAIN,
+    IS_PYOPENSSL,
+    mock_env
+)
+from .utils.plugins_cli import (  # noqa
     broken_plugin,
     dummy_plugin,
     dummy_plugins,
@@ -13,7 +19,11 @@
     httpie_plugins_success,
     interface,
 )
-from .utils.http_server import http_server # noqa
+from .utils.http_server import http_server, localhost_http_server  # noqa
+
+
+# Patch to support `url = str(server)` in addition to `url = server + '/foo'`.
+PyTestHttpBinServer.__str__ = lambda self: self.url
 
 
 @pytest.fixture(scope='function', autouse=True)
@@ -54,13 +64,29 @@ def httpbin_with_chunked_support(_httpbin_with_chunked_support_available):
     pytest.skip(f'{HTTPBIN_WITH_CHUNKED_SUPPORT_DOMAIN} not resolvable')
 
 
+@pytest.fixture(scope='session')
+def _remote_httpbin_available():
+    try:
+        socket.gethostbyname(REMOTE_HTTPBIN_DOMAIN)
+        return True
+    except OSError:
+        return False
+
+
+@pytest.fixture
+def remote_httpbin(_remote_httpbin_available):
+    if _remote_httpbin_available:
+        return 'http://' + REMOTE_HTTPBIN_DOMAIN
+    pytest.skip(f'{REMOTE_HTTPBIN_DOMAIN} not resolvable')
+
+
 @pytest.fixture(autouse=True, scope='session')
 def pyopenssl_inject():
     """
     Injects `pyOpenSSL` module to make sure `requests` will use it.
     <https://github.com/psf/requests/pull/5443#issuecomment-645740394>
     """
-    if os.getenv('HTTPIE_TEST_WITH_PYOPENSSL', '0') == '1':
+    if IS_PYOPENSSL:
         try:
             import urllib3.contrib.pyopenssl
             urllib3.contrib.pyopenssl.inject_into_urllib3()
diff --git a/tests/fixtures/__init__.py b/tests/fixtures/__init__.py
index 126b13276e..6e6e73676e 100644
--- a/tests/fixtures/__init__.py
+++ b/tests/fixtures/__init__.py
@@ -1,6 +1,9 @@
 """Test data"""
+import json
 from pathlib import Path
+from typing import Optional, Dict, Any
 
+import httpie
 from httpie.encoding import UTF8
 from httpie.output.formatters.xml import pretty_xml, parse_xml
 
@@ -19,10 +22,20 @@ def patharg(path):
 JSON_FILE_PATH = FIXTURES_ROOT / 'test.json'
 JSON_WITH_DUPE_KEYS_FILE_PATH = FIXTURES_ROOT / 'test_with_dupe_keys.json'
 BIN_FILE_PATH = FIXTURES_ROOT / 'test.bin'
+
 XML_FILES_PATH = FIXTURES_ROOT / 'xmldata'
 XML_FILES_VALID = list((XML_FILES_PATH / 'valid').glob('*_raw.xml'))
 XML_FILES_INVALID = list((XML_FILES_PATH / 'invalid').glob('*.xml'))
 
+SESSION_FILES_PATH = FIXTURES_ROOT / 'session_data'
+SESSION_FILES_OLD = sorted((SESSION_FILES_PATH / 'old').glob('*.json'))
+SESSION_FILES_NEW = sorted((SESSION_FILES_PATH / 'new').glob('*.json'))
+
+SESSION_VARIABLES = {
+    '__version__': httpie.__version__,
+    '__host__': 'null',
+}
+
 FILE_PATH_ARG = patharg(FILE_PATH)
 BIN_FILE_PATH_ARG = patharg(BIN_FILE_PATH)
 JSON_FILE_PATH_ARG = patharg(JSON_FILE_PATH)
@@ -40,3 +53,14 @@ def patharg(path):
 UNICODE = FILE_CONTENT
 XML_DATA_RAW = '<?xml version="1.0" encoding="utf-8"?><root><e>text</e></root>'
 XML_DATA_FORMATTED = pretty_xml(parse_xml(XML_DATA_RAW))
+
+
+def read_session_file(session_file: Path, *, extra_variables: Optional[Dict[str, str]] = None) -> Any:
+    with open(session_file) as stream:
+        data = stream.read()
+
+    session_vars = {**SESSION_VARIABLES, **(extra_variables or {})}
+    for variable, value in session_vars.items():
+        data = data.replace(variable, value)
+
+    return json.loads(data)
diff --git a/tests/fixtures/session_data/new/cookies_dict.json b/tests/fixtures/session_data/new/cookies_dict.json
new file mode 100644
index 0000000000..4354f4d97d
--- /dev/null
+++ b/tests/fixtures/session_data/new/cookies_dict.json
@@ -0,0 +1,31 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "__version__"
+    },
+    "auth": {
+        "password": null,
+        "type": null,
+        "username": null
+    },
+    "cookies": [
+        {
+            "domain": __host__,
+            "expires": null,
+            "name": "baz",
+            "path": "/",
+            "secure": false,
+            "value": "quux"
+        },
+        {
+            "domain": __host__,
+            "expires": null,
+            "name": "foo",
+            "path": "/",
+            "secure": false,
+            "value": "bar"
+        }
+    ],
+    "headers": []
+}
diff --git a/tests/fixtures/session_data/new/cookies_dict_dev_version.json b/tests/fixtures/session_data/new/cookies_dict_dev_version.json
new file mode 100644
index 0000000000..4354f4d97d
--- /dev/null
+++ b/tests/fixtures/session_data/new/cookies_dict_dev_version.json
@@ -0,0 +1,31 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "__version__"
+    },
+    "auth": {
+        "password": null,
+        "type": null,
+        "username": null
+    },
+    "cookies": [
+        {
+            "domain": __host__,
+            "expires": null,
+            "name": "baz",
+            "path": "/",
+            "secure": false,
+            "value": "quux"
+        },
+        {
+            "domain": __host__,
+            "expires": null,
+            "name": "foo",
+            "path": "/",
+            "secure": false,
+            "value": "bar"
+        }
+    ],
+    "headers": []
+}
diff --git a/tests/fixtures/session_data/new/cookies_dict_with_extras.json b/tests/fixtures/session_data/new/cookies_dict_with_extras.json
new file mode 100644
index 0000000000..baf77da082
--- /dev/null
+++ b/tests/fixtures/session_data/new/cookies_dict_with_extras.json
@@ -0,0 +1,39 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "__version__"
+    },
+    "auth": {
+        "raw_auth": "foo:bar",
+        "type": "basic"
+    },
+    "cookies": [
+        {
+            "domain": __host__,
+            "expires": null,
+            "name": "baz",
+            "path": "/",
+            "secure": false,
+            "value": "quux"
+        },
+        {
+            "domain": __host__,
+            "expires": null,
+            "name": "foo",
+            "path": "/",
+            "secure": false,
+            "value": "bar"
+        }
+    ],
+    "headers": [
+        {
+            "name": "X-Data",
+            "value": "value"
+        },
+        {
+            "name": "X-Foo",
+            "value": "bar"
+        }
+    ]
+}
diff --git a/tests/fixtures/session_data/new/empty_cookies_dict.json b/tests/fixtures/session_data/new/empty_cookies_dict.json
new file mode 100644
index 0000000000..a2f3c5c463
--- /dev/null
+++ b/tests/fixtures/session_data/new/empty_cookies_dict.json
@@ -0,0 +1,14 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "__version__"
+    },
+    "auth": {
+        "password": null,
+        "type": null,
+        "username": null
+    },
+    "cookies": [],
+    "headers": []
+}
diff --git a/tests/fixtures/session_data/new/empty_cookies_list.json b/tests/fixtures/session_data/new/empty_cookies_list.json
new file mode 100644
index 0000000000..a2f3c5c463
--- /dev/null
+++ b/tests/fixtures/session_data/new/empty_cookies_list.json
@@ -0,0 +1,14 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "__version__"
+    },
+    "auth": {
+        "password": null,
+        "type": null,
+        "username": null
+    },
+    "cookies": [],
+    "headers": []
+}
diff --git a/tests/fixtures/session_data/new/empty_headers_dict.json b/tests/fixtures/session_data/new/empty_headers_dict.json
new file mode 100644
index 0000000000..a2f3c5c463
--- /dev/null
+++ b/tests/fixtures/session_data/new/empty_headers_dict.json
@@ -0,0 +1,14 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "__version__"
+    },
+    "auth": {
+        "password": null,
+        "type": null,
+        "username": null
+    },
+    "cookies": [],
+    "headers": []
+}
diff --git a/tests/fixtures/session_data/new/empty_headers_list.json b/tests/fixtures/session_data/new/empty_headers_list.json
new file mode 100644
index 0000000000..a2f3c5c463
--- /dev/null
+++ b/tests/fixtures/session_data/new/empty_headers_list.json
@@ -0,0 +1,14 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "__version__"
+    },
+    "auth": {
+        "password": null,
+        "type": null,
+        "username": null
+    },
+    "cookies": [],
+    "headers": []
+}
diff --git a/tests/fixtures/session_data/new/headers_cookies_dict_mixed.json b/tests/fixtures/session_data/new/headers_cookies_dict_mixed.json
new file mode 100644
index 0000000000..f2eb3fe313
--- /dev/null
+++ b/tests/fixtures/session_data/new/headers_cookies_dict_mixed.json
@@ -0,0 +1,40 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "__version__"
+    },
+    "auth": {
+        "password": null,
+        "type": null,
+        "username": null
+    },
+    "cookies": [
+        {
+            "domain": __host__,
+            "expires": null,
+            "name": "baz",
+            "path": "/",
+            "secure": false,
+            "value": "quux"
+        },
+        {
+            "domain": __host__,
+            "expires": null,
+            "name": "foo",
+            "path": "/",
+            "secure": false,
+            "value": "bar"
+        }
+    ],
+    "headers": [
+        {
+            "name": "X-Data",
+            "value": "value"
+        },
+        {
+            "name": "X-Foo",
+            "value": "bar"
+        }
+    ]
+}
diff --git a/tests/fixtures/session_data/new/headers_dict.json b/tests/fixtures/session_data/new/headers_dict.json
new file mode 100644
index 0000000000..5a04c4b03b
--- /dev/null
+++ b/tests/fixtures/session_data/new/headers_dict.json
@@ -0,0 +1,23 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "__version__"
+    },
+    "auth": {
+        "password": null,
+        "type": null,
+        "username": null
+    },
+    "cookies": [],
+    "headers": [
+        {
+            "name": "foo",
+            "value": "bar"
+        },
+        {
+            "name": "baz",
+            "value": "quux"
+        }
+    ]
+}
diff --git a/tests/fixtures/session_data/new/headers_dict_extras.json b/tests/fixtures/session_data/new/headers_dict_extras.json
new file mode 100644
index 0000000000..f0ae1763ed
--- /dev/null
+++ b/tests/fixtures/session_data/new/headers_dict_extras.json
@@ -0,0 +1,39 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "__version__"
+    },
+    "auth": {
+        "raw_auth": "foo:bar",
+        "type": "basic"
+    },
+    "cookies": [
+        {
+            "domain": null,
+            "expires": null,
+            "name": "baz",
+            "path": "/",
+            "secure": false,
+            "value": "quux"
+        },
+        {
+            "domain": null,
+            "expires": null,
+            "name": "foo",
+            "path": "/",
+            "secure": false,
+            "value": "bar"
+        }
+    ],
+    "headers": [
+        {
+            "name": "X-Data",
+            "value": "value"
+        },
+        {
+            "name": "X-Foo",
+            "value": "bar"
+        }
+    ]
+}
diff --git a/tests/fixtures/session_data/new/headers_list.json b/tests/fixtures/session_data/new/headers_list.json
new file mode 100644
index 0000000000..7fe309d878
--- /dev/null
+++ b/tests/fixtures/session_data/new/headers_list.json
@@ -0,0 +1,23 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "3.2.0"
+    },
+    "auth": {
+        "password": null,
+        "type": null,
+        "username": null
+    },
+    "cookies": [],
+    "headers": [
+        {
+            "name": "X-Data",
+            "value": "value"
+        },
+        {
+            "name": "X-Foo",
+            "value": "bar"
+        }
+    ]
+}
diff --git a/tests/fixtures/session_data/old/cookies_dict.json b/tests/fixtures/session_data/old/cookies_dict.json
new file mode 100644
index 0000000000..5521ee2217
--- /dev/null
+++ b/tests/fixtures/session_data/old/cookies_dict.json
@@ -0,0 +1,27 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "3.0.2"
+    },
+    "auth": {
+        "password": null,
+        "type": null,
+        "username": null
+    },
+    "cookies": {
+        "baz": {
+            "expires": null,
+            "path": "/",
+            "secure": false,
+            "value": "quux"
+        },
+        "foo": {
+            "expires": null,
+            "path": "/",
+            "secure": false,
+            "value": "bar"
+        }
+    },
+    "headers": []
+}
diff --git a/tests/fixtures/session_data/old/cookies_dict_dev_version.json b/tests/fixtures/session_data/old/cookies_dict_dev_version.json
new file mode 100644
index 0000000000..e460390d52
--- /dev/null
+++ b/tests/fixtures/session_data/old/cookies_dict_dev_version.json
@@ -0,0 +1,27 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "2.7.0.dev0"
+    },
+    "auth": {
+        "password": null,
+        "type": null,
+        "username": null
+    },
+    "cookies": {
+        "baz": {
+            "expires": null,
+            "path": "/",
+            "secure": false,
+            "value": "quux"
+        },
+        "foo": {
+            "expires": null,
+            "path": "/",
+            "secure": false,
+            "value": "bar"
+        }
+    },
+    "headers": []
+}
diff --git a/tests/fixtures/session_data/old/cookies_dict_with_extras.json b/tests/fixtures/session_data/old/cookies_dict_with_extras.json
new file mode 100644
index 0000000000..0649379acf
--- /dev/null
+++ b/tests/fixtures/session_data/old/cookies_dict_with_extras.json
@@ -0,0 +1,35 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "3.0.2"
+    },
+    "auth": {
+        "raw_auth": "foo:bar",
+        "type": "basic"
+    },
+    "cookies": {
+        "baz": {
+            "expires": null,
+            "path": "/",
+            "secure": false,
+            "value": "quux"
+        },
+        "foo": {
+            "expires": null,
+            "path": "/",
+            "secure": false,
+            "value": "bar"
+        }
+    },
+    "headers": [
+        {
+            "name": "X-Data",
+            "value": "value"
+        },
+        {
+            "name": "X-Foo",
+            "value": "bar"
+        }
+    ]
+}
diff --git a/tests/fixtures/session_data/old/empty_cookies_dict.json b/tests/fixtures/session_data/old/empty_cookies_dict.json
new file mode 100644
index 0000000000..aba17ad5db
--- /dev/null
+++ b/tests/fixtures/session_data/old/empty_cookies_dict.json
@@ -0,0 +1,14 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "3.0.2"
+    },
+    "auth": {
+        "password": null,
+        "type": null,
+        "username": null
+    },
+    "cookies": {},
+    "headers": []
+}
diff --git a/tests/fixtures/session_data/old/empty_cookies_list.json b/tests/fixtures/session_data/old/empty_cookies_list.json
new file mode 100644
index 0000000000..faf07a6efc
--- /dev/null
+++ b/tests/fixtures/session_data/old/empty_cookies_list.json
@@ -0,0 +1,14 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "3.0.2"
+    },
+    "auth": {
+        "password": null,
+        "type": null,
+        "username": null
+    },
+    "cookies": [],
+    "headers": []
+}
diff --git a/tests/fixtures/session_data/old/empty_headers_dict.json b/tests/fixtures/session_data/old/empty_headers_dict.json
new file mode 100644
index 0000000000..12194f7ed2
--- /dev/null
+++ b/tests/fixtures/session_data/old/empty_headers_dict.json
@@ -0,0 +1,14 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "3.0.2"
+    },
+    "auth": {
+        "password": null,
+        "type": null,
+        "username": null
+    },
+    "cookies": [],
+    "headers": {}
+}
diff --git a/tests/fixtures/session_data/old/empty_headers_list.json b/tests/fixtures/session_data/old/empty_headers_list.json
new file mode 100644
index 0000000000..faf07a6efc
--- /dev/null
+++ b/tests/fixtures/session_data/old/empty_headers_list.json
@@ -0,0 +1,14 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "3.0.2"
+    },
+    "auth": {
+        "password": null,
+        "type": null,
+        "username": null
+    },
+    "cookies": [],
+    "headers": []
+}
diff --git a/tests/fixtures/session_data/old/headers_cookies_dict_mixed.json b/tests/fixtures/session_data/old/headers_cookies_dict_mixed.json
new file mode 100644
index 0000000000..38be090209
--- /dev/null
+++ b/tests/fixtures/session_data/old/headers_cookies_dict_mixed.json
@@ -0,0 +1,30 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "3.0.2"
+    },
+    "auth": {
+        "password": null,
+        "type": null,
+        "username": null
+    },
+    "cookies": {
+        "baz": {
+            "expires": null,
+            "path": "/",
+            "secure": false,
+            "value": "quux"
+        },
+        "foo": {
+            "expires": null,
+            "path": "/",
+            "secure": false,
+            "value": "bar"
+        }
+    },
+    "headers": {
+        "X-Data": "value",
+        "X-Foo": "bar"
+    }
+}
diff --git a/tests/fixtures/session_data/old/headers_dict.json b/tests/fixtures/session_data/old/headers_dict.json
new file mode 100644
index 0000000000..f77e6fd139
--- /dev/null
+++ b/tests/fixtures/session_data/old/headers_dict.json
@@ -0,0 +1,17 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "3.1.0"
+    },
+    "auth": {
+        "password": null,
+        "type": null,
+        "username": null
+    },
+    "cookies": [],
+    "headers": {
+        "foo": "bar",
+        "baz": "quux"
+    }
+}
diff --git a/tests/fixtures/session_data/old/headers_dict_extras.json b/tests/fixtures/session_data/old/headers_dict_extras.json
new file mode 100644
index 0000000000..b7978cef17
--- /dev/null
+++ b/tests/fixtures/session_data/old/headers_dict_extras.json
@@ -0,0 +1,33 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "3.1.0"
+    },
+    "auth": {
+        "raw_auth": "foo:bar",
+        "type": "basic"
+    },
+    "cookies": [
+        {
+            "domain": null,
+            "name": "baz",
+            "expires": null,
+            "path": "/",
+            "secure": false,
+            "value": "quux"
+        },
+        {
+            "domain": null,
+            "name": "foo",
+            "expires": null,
+            "path": "/",
+            "secure": false,
+            "value": "bar"
+        }
+    ],
+    "headers": {
+        "X-Data": "value",
+        "X-Foo": "bar"
+    }
+}
diff --git a/tests/fixtures/session_data/old/headers_list.json b/tests/fixtures/session_data/old/headers_list.json
new file mode 100644
index 0000000000..7fe309d878
--- /dev/null
+++ b/tests/fixtures/session_data/old/headers_list.json
@@ -0,0 +1,23 @@
+{
+    "__meta__": {
+        "about": "HTTPie session file",
+        "help": "https://httpie.io/docs#sessions",
+        "httpie": "3.2.0"
+    },
+    "auth": {
+        "password": null,
+        "type": null,
+        "username": null
+    },
+    "cookies": [],
+    "headers": [
+        {
+            "name": "X-Data",
+            "value": "value"
+        },
+        {
+            "name": "X-Foo",
+            "value": "bar"
+        }
+    ]
+}
diff --git a/tests/test_auth.py b/tests/test_auth.py
index 219576a327..83423efec0 100644
--- a/tests/test_auth.py
+++ b/tests/test_auth.py
@@ -42,7 +42,7 @@ def test_bearer_auth(httpbin_both, token):
             new=lambda self, prompt: 'password')
 def test_password_prompt(httpbin):
     r = http('--auth', 'user',
-             'GET', httpbin.url + '/basic-auth/user/password')
+             'GET', httpbin + '/basic-auth/user/password')
     assert HTTP_OK in r
     assert r.json == {'authenticated': True, 'user': 'user'}
 
@@ -71,7 +71,7 @@ def test_credentials_in_url_auth_flag_has_priority(httpbin_both):
 ])
 def test_only_username_in_url(url):
     """
-    https://github.com/httpie/httpie/issues/242
+    https://github.com/httpie/cli/issues/242
 
     """
     args = httpie.cli.definition.parser.parse_args(args=[url], env=MockEnvironment())
diff --git a/tests/test_binary.py b/tests/test_binary.py
index ca51aa1686..c5e63ec30e 100644
--- a/tests/test_binary.py
+++ b/tests/test_binary.py
@@ -15,18 +15,18 @@ def test_binary_stdin(self, httpbin):
                 stdin_isatty=False,
                 stdout_isatty=False
             )
-            r = http('--print=B', 'POST', httpbin.url + '/post', env=env)
+            r = http('--print=B', 'POST', httpbin + '/post', env=env)
             assert r == BIN_FILE_CONTENT
 
     def test_binary_file_path(self, httpbin):
         env = MockEnvironment(stdin_isatty=True, stdout_isatty=False)
-        r = http('--print=B', 'POST', httpbin.url + '/post',
+        r = http('--print=B', 'POST', httpbin + '/post',
                  '@' + BIN_FILE_PATH_ARG, env=env)
         assert r == BIN_FILE_CONTENT
 
     def test_binary_file_form(self, httpbin):
         env = MockEnvironment(stdin_isatty=True, stdout_isatty=False)
-        r = http('--print=B', '--form', 'POST', httpbin.url + '/post',
+        r = http('--print=B', '--form', 'POST', httpbin + '/post',
                  'test@' + BIN_FILE_PATH_ARG, env=env)
         assert bytes(BIN_FILE_CONTENT) in bytes(r)
 
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 6504c8a980..2cd27574af 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -151,17 +151,17 @@ def test_multiple_text_fields_with_same_field_name(self):
 
 class TestQuerystring:
     def test_query_string_params_in_url(self, httpbin):
-        r = http('--print=Hhb', 'GET', httpbin.url + '/get?a=1&b=2')
+        r = http('--print=Hhb', 'GET', httpbin + '/get?a=1&b=2')
         path = '/get?a=1&b=2'
-        url = httpbin.url + path
+        url = httpbin + path
         assert HTTP_OK in r
         assert f'GET {path} HTTP/1.1' in r
         assert f'"url": "{url}"' in r
 
     def test_query_string_params_items(self, httpbin):
-        r = http('--print=Hhb', 'GET', httpbin.url + '/get', 'a==1')
+        r = http('--print=Hhb', 'GET', httpbin + '/get', 'a==1')
         path = '/get?a=1'
-        url = httpbin.url + path
+        url = httpbin + path
         assert HTTP_OK in r
         assert f'GET {path} HTTP/1.1' in r
         assert f'"url": "{url}"' in r
@@ -169,9 +169,9 @@ def test_query_string_params_items(self, httpbin):
     def test_query_string_params_in_url_and_items_with_duplicates(self,
                                                                   httpbin):
         r = http('--print=Hhb', 'GET',
-                 httpbin.url + '/get?a=1&a=1', 'a==1', 'a==1')
+                 httpbin + '/get?a=1&a=1', 'a==1', 'a==1')
         path = '/get?a=1&a=1&a=1&a=1'
-        url = httpbin.url + path
+        url = httpbin + path
         assert HTTP_OK in r
         assert f'GET {path} HTTP/1.1' in r
         assert f'"url": "{url}"' in r
@@ -320,11 +320,11 @@ def test_guess_when_method_set_but_invalid_and_item_exists(self):
 class TestNoOptions:
 
     def test_valid_no_options(self, httpbin):
-        r = http('--verbose', '--no-verbose', 'GET', httpbin.url + '/get')
+        r = http('--verbose', '--no-verbose', 'GET', httpbin + '/get')
         assert 'GET /get HTTP/1.1' not in r
 
     def test_invalid_no_options(self, httpbin):
-        r = http('--no-war', 'GET', httpbin.url + '/get',
+        r = http('--no-war', 'GET', httpbin + '/get',
                  tolerate_error_exit_status=True)
         assert r.exit_status == ExitStatus.ERROR
         assert 'unrecognized arguments: --no-war' in r.stderr
@@ -338,13 +338,13 @@ def test_ignore_stdin(self, httpbin):
             stdin=StdinBytesIO(FILE_PATH.read_bytes()),
             stdin_isatty=False,
         )
-        r = http('--ignore-stdin', '--verbose', httpbin.url + '/get', env=env)
+        r = http('--ignore-stdin', '--verbose', httpbin + '/get', env=env)
         assert HTTP_OK in r
         assert 'GET /get HTTP' in r, "Don't default to POST."
         assert FILE_CONTENT not in r, "Don't send stdin data."
 
     def test_ignore_stdin_cannot_prompt_password(self, httpbin):
-        r = http('--ignore-stdin', '--auth=no-password', httpbin.url + '/get',
+        r = http('--ignore-stdin', '--auth=no-password', httpbin + '/get',
                  tolerate_error_exit_status=True)
         assert r.exit_status == ExitStatus.ERROR
         assert 'because --ignore-stdin' in r.stderr
diff --git a/tests/test_cli_ui.py b/tests/test_cli_ui.py
new file mode 100644
index 0000000000..bb744cdc4e
--- /dev/null
+++ b/tests/test_cli_ui.py
@@ -0,0 +1,65 @@
+import pytest
+import shutil
+import os
+from tests.utils import http
+
+NAKED_BASE_TEMPLATE = """\
+usage:
+    http {extra_args}[METHOD] URL [REQUEST_ITEM ...]
+
+error:
+    {error_msg}
+
+for more information:
+    run 'http --help' or visit https://httpie.io/docs/cli
+
+"""
+
+NAKED_HELP_MESSAGE = NAKED_BASE_TEMPLATE.format(
+    extra_args="",
+    error_msg="the following arguments are required: URL"
+)
+
+NAKED_HELP_MESSAGE_PRETTY_WITH_NO_ARG = NAKED_BASE_TEMPLATE.format(
+    extra_args="--pretty {all, colors, format, none} ",
+    error_msg="argument --pretty: expected one argument"
+)
+
+NAKED_HELP_MESSAGE_PRETTY_WITH_INVALID_ARG = NAKED_BASE_TEMPLATE.format(
+    extra_args="--pretty {all, colors, format, none} ",
+    error_msg="argument --pretty: invalid choice: '$invalid' (choose from 'all', 'colors', 'format', 'none')"
+)
+
+
+PREDEFINED_TERMINAL_SIZE = (200, 100)
+
+
+@pytest.fixture(scope="function")
+def ignore_terminal_size(monkeypatch):
+    """Some tests wrap/crop the output depending on the
+    size of the executed terminal, which might not be consistent
+    through all runs.
+
+    This fixture ensures every run uses the same exact configuration.
+    """
+
+    def fake_terminal_size(*args, **kwargs):
+        return os.terminal_size(PREDEFINED_TERMINAL_SIZE)
+
+    # Setting COLUMNS as an env var is required for 3.8<
+    monkeypatch.setitem(os.environ, 'COLUMNS', str(PREDEFINED_TERMINAL_SIZE[0]))
+    monkeypatch.setattr(shutil, 'get_terminal_size', fake_terminal_size)
+    monkeypatch.setattr(os, 'get_terminal_size', fake_terminal_size)
+
+
+@pytest.mark.parametrize(
+    'args, expected_msg', [
+        ([], NAKED_HELP_MESSAGE),
+        (['--pretty'], NAKED_HELP_MESSAGE_PRETTY_WITH_NO_ARG),
+        (['pie.dev', '--pretty'], NAKED_HELP_MESSAGE_PRETTY_WITH_NO_ARG),
+        (['--pretty', '$invalid'], NAKED_HELP_MESSAGE_PRETTY_WITH_INVALID_ARG),
+    ]
+)
+def test_naked_invocation(ignore_terminal_size, args, expected_msg):
+    result = http(*args, tolerate_error_exit_status=True)
+    assert result.stderr == expected_msg
diff --git a/tests/test_cli_utils.py b/tests/test_cli_utils.py
index 2bc4d0a28e..8041727b57 100644
--- a/tests/test_cli_utils.py
+++ b/tests/test_cli_utils.py
@@ -28,7 +28,7 @@ def test_lazy_choices():
         cache=False  # for test purposes
     )
 
-    # Parser initalization doesn't call it.
+    # Parser initialization doesn't call it.
     getter.assert_not_called()
 
     # If we don't use --lazy-option, we don't retrieve it.
@@ -69,7 +69,7 @@ def test_lazy_choices_help():
         cache=False  # for test purposes
     )
 
-    # Parser initalization doesn't call it.
+    # Parser initialization doesn't call it.
     getter.assert_not_called()
 
     # If we don't use `--help`, we don't use it.
@@ -83,4 +83,4 @@ def test_lazy_choices_help():
     # If we use --help, then we call it with styles
     with pytest.raises(SystemExit):
         parser.parse_args(['--help'])
-    help_formatter.assert_called_once_with(['a', 'b', 'c'])
+    help_formatter.assert_called_once_with(['a', 'b', 'c'], isolation_mode=False)
diff --git a/tests/test_compress.py b/tests/test_compress.py
index 854a23e26e..de5d8a7c48 100644
--- a/tests/test_compress.py
+++ b/tests/test_compress.py
@@ -29,14 +29,14 @@ def assert_decompressed_equal(base64_compressed_data, expected_str):
 
 
 def test_cannot_combine_compress_with_chunked(httpbin):
-    r = http('--compress', '--chunked', httpbin.url + '/get',
+    r = http('--compress', '--chunked', httpbin + '/get',
              tolerate_error_exit_status=True)
     assert r.exit_status == ExitStatus.ERROR
     assert 'cannot combine --compress and --chunked' in r.stderr
 
 
 def test_cannot_combine_compress_with_multipart(httpbin):
-    r = http('--compress', '--multipart', httpbin.url + '/get',
+    r = http('--compress', '--multipart', httpbin + '/get',
              tolerate_error_exit_status=True)
     assert r.exit_status == ExitStatus.ERROR
     assert 'cannot combine --compress and --multipart' in r.stderr
diff --git a/tests/test_config.py b/tests/test_config.py
index be19d572e4..1d2eea0750 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -17,7 +17,7 @@ def test_default_options(httpbin):
     env = MockEnvironment()
     env.config['default_options'] = ['--form']
     env.config.save()
-    r = http(httpbin.url + '/post', 'foo=bar', env=env)
+    r = http(httpbin + '/post', 'foo=bar', env=env)
     assert r.json['form'] == {
         "foo": "bar"
     }
@@ -51,7 +51,7 @@ def test_default_options_overwrite(httpbin):
     env = MockEnvironment()
     env.config['default_options'] = ['--form']
     env.config.save()
-    r = http('--json', httpbin.url + '/post', 'foo=bar', env=env)
+    r = http('--json', httpbin + '/post', 'foo=bar', env=env)
     assert r.json['json'] == {
         "foo": "bar"
     }
diff --git a/tests/test_cookie_on_redirects.py b/tests/test_cookie_on_redirects.py
new file mode 100644
index 0000000000..2b0ab73b4a
--- /dev/null
+++ b/tests/test_cookie_on_redirects.py
@@ -0,0 +1,250 @@
+import pytest
+from .utils import http
+
+
+@pytest.mark.parametrize('target_httpbin', [
+    'httpbin',
+    'remote_httpbin',
+])
+def test_explicit_user_set_cookie(httpbin, target_httpbin, request):
+    """User set cookies ARE NOT persisted within redirects when there is no session, even on the same domain."""
+    target_httpbin = request.getfixturevalue(target_httpbin)
+    r = http(
+        '--follow',
+        httpbin + '/redirect-to',
+        f'url=={target_httpbin}/cookies',
+        'Cookie:a=b'
+    )
+    assert r.json == {'cookies': {}}
+
+
+@pytest.mark.parametrize('target_httpbin', [
+    'httpbin',
+    'remote_httpbin',
+])
+def test_explicit_user_set_cookie_in_session(tmp_path, httpbin, target_httpbin, request):
+    """User set cookies ARE persisted within redirects when there is A session, even on the same domain."""
+    target_httpbin = request.getfixturevalue(target_httpbin)
+    r = http(
+        '--follow',
+        '--session',
+        str(tmp_path / 'session.json'),
+        httpbin + '/redirect-to',
+        f'url=={target_httpbin}/cookies',
+        'Cookie:a=b'
+    )
+    assert r.json == {'cookies': {'a': 'b'}}
+
+
+@pytest.mark.parametrize('target_httpbin', [
+    'httpbin',
+    'remote_httpbin',
+])
+def test_saved_user_set_cookie_in_session(tmp_path, httpbin, target_httpbin, request):
+    """User set cookies ARE persisted within redirects when there is A session, even on the same domain."""
+    target_httpbin = request.getfixturevalue(target_httpbin)
+    http(
+        '--follow',
+        '--session',
+        str(tmp_path / 'session.json'),
+        httpbin + '/get',
+        'Cookie:a=b'
+    )
+    r = http(
+        '--follow',
+        '--session',
+        str(tmp_path / 'session.json'),
+        httpbin + '/redirect-to',
+        f'url=={target_httpbin}/cookies',
+    )
+    assert r.json == {'cookies': {'a': 'b'}}
+
+
+@pytest.mark.parametrize('target_httpbin', [
+    'httpbin',
+    'remote_httpbin',
+])
+@pytest.mark.parametrize('session', [True, False])
+def test_explicit_user_set_headers(httpbin, tmp_path, target_httpbin, session, request):
+    """
+    User set headers ARE persisted within redirects even on different domains domain with or without an active session.
+
+    """
+    target_httpbin = request.getfixturevalue(target_httpbin)
+    session_args = []
+    if session:
+        session_args.extend([
+            '--session',
+            str(tmp_path / 'session.json')
+        ])
+    r = http(
+        '--follow',
+        *session_args,
+        httpbin + '/redirect-to',
+        f'url=={target_httpbin}/get',
+        'X-Custom-Header:value'
+    )
+    assert 'X-Custom-Header' in r.json['headers']
+
+
+@pytest.mark.parametrize('session', [True, False])
+def test_server_set_cookie_on_redirect_same_domain(tmp_path, httpbin, session):
+    """Server set cookies ARE persisted on the same domain when they are forwarded."""
+    session_args = []
+    if session:
+        session_args.extend([
+            '--session',
+            str(tmp_path / 'session.json')
+        ])
+    r = http(
+        '--follow',
+        *session_args,
+        httpbin + '/cookies/set/a/b',
+    )
+    assert r.json['cookies'] == {'a': 'b'}
+
+
+@pytest.mark.parametrize('session', [True, False])
+def test_server_set_cookie_on_redirect_different_domain(tmp_path, http_server, httpbin, session):
+    # Server set cookies ARE persisted on different domains
+    # when they are forwarded.
+
+    session_args = []
+    if session:
+        session_args.extend([
+            '--session',
+            str(tmp_path / 'session.json')
+        ])
+
+    r = http(
+        '--follow',
+        *session_args,
+        http_server + '/cookies/set-and-redirect',
+        f"X-Redirect-To:{httpbin + '/cookies'}",
+        'X-Cookies:a=b'
+    )
+    assert r.json['cookies'] == {'a': 'b'}
+
+
+def test_saved_session_cookies_on_same_domain(tmp_path, httpbin):
+    """Saved session cookies ARE persisted when making a new request to the same domain."""
+    http(
+        '--session',
+        str(tmp_path / 'session.json'),
+        httpbin + '/cookies/set/a/b'
+    )
+    r = http(
+        '--session',
+        str(tmp_path / 'session.json'),
+        httpbin + '/cookies'
+    )
+    assert r.json == {'cookies': {'a': 'b'}}
+
+
+def test_saved_session_cookies_on_different_domain(tmp_path, httpbin, remote_httpbin):
+    """Saved session cookies ARE persisted when making a new request to a different domain."""
+    http(
+        '--session',
+        str(tmp_path / 'session.json'),
+        httpbin + '/cookies/set/a/b'
+    )
+    r = http(
+        '--session',
+        str(tmp_path / 'session.json'),
+        remote_httpbin + '/cookies'
+    )
+    assert r.json == {'cookies': {}}
+
+
+@pytest.mark.parametrize(['initial_domain', 'first_request_domain', 'second_request_domain', 'expect_cookies'], [
+    (
+        # Cookies are set by    Domain A
+        # Initial domain is     Domain A
+        # Redirected domain is  Domain A
+        'httpbin',
+        'httpbin',
+        'httpbin',
+        True,
+    ),
+    (
+        # Cookies are set by    Domain A
+        # Initial domain is     Domain B
+        # Redirected domain is  Domain B
+        'httpbin',
+        'remote_httpbin',
+        'remote_httpbin',
+        False,
+    ),
+    (
+        # Cookies are set by    Domain A
+        # Initial domain is     Domain A
+        # Redirected domain is  Domain B
+        'httpbin',
+        'httpbin',
+        'remote_httpbin',
+        False,
+    ),
+    (
+        # Cookies are set by    Domain A
+        # Initial domain is     Domain B
+        # Redirected domain is  Domain A
+        'httpbin',
+        'remote_httpbin',
+        'httpbin',
+        True,
+    ),
+])
+def test_saved_session_cookies_on_redirect(
+        tmp_path, initial_domain, first_request_domain, second_request_domain, expect_cookies, request):
+    initial_domain = request.getfixturevalue(initial_domain)
+    first_request_domain = request.getfixturevalue(first_request_domain)
+    second_request_domain = request.getfixturevalue(second_request_domain)
+    http(
+        '--session',
+        str(tmp_path / 'session.json'),
+        initial_domain + '/cookies/set/a/b'
+    )
+    r = http(
+        '--session',
+        str(tmp_path / 'session.json'),
+        '--follow',
+        first_request_domain + '/redirect-to',
+        f'url=={second_request_domain}/cookies'
+    )
+    if expect_cookies:
+        expected_data = {'cookies': {'a': 'b'}}
+    else:
+        expected_data = {'cookies': {}}
+    assert r.json == expected_data
+
+
+def test_saved_session_cookie_pool(tmp_path, httpbin, remote_httpbin):
+    http(
+        '--session',
+        str(tmp_path / 'session.json'),
+        httpbin + '/cookies/set/a/b'
+    )
+    http(
+        '--session',
+        str(tmp_path / 'session.json'),
+        remote_httpbin + '/cookies/set/a/c'
+    )
+    http(
+        '--session',
+        str(tmp_path / 'session.json'),
+        remote_httpbin + '/cookies/set/b/d'
+    )
+
+    response = http(
+        '--session',
+        str(tmp_path / 'session.json'),
+        httpbin + '/cookies'
+    )
+    assert response.json['cookies'] == {'a': 'b'}
+
+    response = http(
+        '--session',
+        str(tmp_path / 'session.json'),
+        remote_httpbin + '/cookies'
+    )
+    assert response.json['cookies'] == {'a': 'c', 'b': 'd'}
diff --git a/tests/test_defaults.py b/tests/test_defaults.py
index 22c7aae25d..dc91211649 100644
--- a/tests/test_defaults.py
+++ b/tests/test_defaults.py
@@ -11,12 +11,12 @@
 
 def test_default_headers_case_insensitive(httpbin):
     """
-    <https://github.com/httpie/httpie/issues/644>
+    <https://github.com/httpie/cli/issues/644>
     """
     r = http(
         '--debug',
         '--print=H',
-        httpbin.url + '/post',
+        httpbin + '/post',
         'CONTENT-TYPE:application/json-patch+json',
         'a=b',
     )
@@ -27,26 +27,26 @@ def test_default_headers_case_insensitive(httpbin):
 # noinspection PyPep8Naming
 class TestImplicitHTTPMethod:
     def test_implicit_GET(self, httpbin):
-        r = http(httpbin.url + '/get')
+        r = http(httpbin + '/get')
         assert HTTP_OK in r
 
     def test_implicit_GET_with_headers(self, httpbin):
-        r = http(httpbin.url + '/headers', 'Foo:bar')
+        r = http(httpbin + '/headers', 'Foo:bar')
         assert HTTP_OK in r
         assert r.json['headers']['Foo'] == 'bar'
 
     def test_implicit_POST_json(self, httpbin):
-        r = http(httpbin.url + '/post', 'hello=world')
+        r = http(httpbin + '/post', 'hello=world')
         assert HTTP_OK in r
         assert r.json['json'] == {'hello': 'world'}
 
     def test_implicit_POST_form(self, httpbin):
-        r = http('--form', httpbin.url + '/post', 'foo=bar')
+        r = http('--form', httpbin + '/post', 'foo=bar')
         assert HTTP_OK in r
         assert r.json['form'] == {'foo': 'bar'}
 
     def test_implicit_POST_raw(self, httpbin):
-        r = http('--raw', 'foo bar', httpbin.url + '/post')
+        r = http('--raw', 'foo bar', httpbin + '/post')
         assert HTTP_OK in r
         assert r.json['data'] == 'foo bar'
 
@@ -55,7 +55,7 @@ def test_implicit_POST_stdin(self, httpbin):
             stdin_isatty=False,
             stdin=BytesIO(FILE_PATH.read_bytes())
         )
-        r = http('--form', httpbin.url + '/post', env=env)
+        r = http('--form', httpbin + '/post', env=env)
         assert HTTP_OK in r
 
 
@@ -68,42 +68,42 @@ class TestAutoContentTypeAndAcceptHeaders:
     """
 
     def test_GET_no_data_no_auto_headers(self, httpbin):
-        # https://github.com/httpie/httpie/issues/62
-        r = http('GET', httpbin.url + '/headers')
+        # https://github.com/httpie/cli/issues/62
+        r = http('GET', httpbin + '/headers')
         assert HTTP_OK in r
         assert r.json['headers']['Accept'] == '*/*'
         assert 'Content-Type' not in r.json['headers']
 
     def test_POST_no_data_no_auto_headers(self, httpbin):
         # JSON headers shouldn't be automatically set for POST with no data.
-        r = http('POST', httpbin.url + '/post')
+        r = http('POST', httpbin + '/post')
         assert HTTP_OK in r
         assert '"Accept": "*/*"' in r
         assert '"Content-Type": "application/json' not in r
 
     def test_POST_with_data_auto_JSON_headers(self, httpbin):
-        r = http('POST', httpbin.url + '/post', 'a=b')
+        r = http('POST', httpbin + '/post', 'a=b')
         assert HTTP_OK in r
         assert r.json['headers']['Accept'] == JSON_ACCEPT
         assert r.json['headers']['Content-Type'] == 'application/json'
 
     def test_GET_with_data_auto_JSON_headers(self, httpbin):
         # JSON headers should automatically be set also for GET with data.
-        r = http('POST', httpbin.url + '/post', 'a=b')
+        r = http('POST', httpbin + '/post', 'a=b')
         assert HTTP_OK in r
         assert r.json['headers']['Accept'] == JSON_ACCEPT
         assert r.json['headers']['Content-Type'] == 'application/json'
 
     def test_POST_explicit_JSON_JSON_ACCEPT(self, httpbin):
-        r = http('--json', 'POST', httpbin.url + '/post')
+        r = http('--json', 'POST', httpbin + '/post')
         assert HTTP_OK in r
         assert r.json['headers']['Accept'] == JSON_ACCEPT
         # Make sure Content-Type gets set even with no data.
-        # https://github.com/httpie/httpie/issues/137
+        # https://github.com/httpie/cli/issues/137
         assert 'application/json' in r.json['headers']['Content-Type']
 
     def test_GET_explicit_JSON_explicit_headers(self, httpbin):
-        r = http('--json', 'GET', httpbin.url + '/headers',
+        r = http('--json', 'GET', httpbin + '/headers',
                  'Accept:application/xml',
                  'Content-Type:application/xml')
         assert HTTP_OK in r
@@ -111,22 +111,22 @@ def test_GET_explicit_JSON_explicit_headers(self, httpbin):
         assert '"Content-Type": "application/xml"' in r
 
     def test_POST_form_auto_Content_Type(self, httpbin):
-        r = http('--form', 'POST', httpbin.url + '/post')
+        r = http('--form', 'POST', httpbin + '/post')
         assert HTTP_OK in r
         assert '"Content-Type": "application/x-www-form-urlencoded' in r
 
     def test_POST_form_Content_Type_override(self, httpbin):
-        r = http('--form', 'POST', httpbin.url + '/post',
+        r = http('--form', 'POST', httpbin + '/post',
                  'Content-Type:application/xml')
         assert HTTP_OK in r
         assert '"Content-Type": "application/xml"' in r
 
     def test_print_only_body_when_stdout_redirected_by_default(self, httpbin):
         env = MockEnvironment(stdin_isatty=True, stdout_isatty=False)
-        r = http('GET', httpbin.url + '/get', env=env)
+        r = http('GET', httpbin + '/get', env=env)
         assert 'HTTP/' not in r
 
     def test_print_overridable_when_stdout_redirected(self, httpbin):
         env = MockEnvironment(stdin_isatty=True, stdout_isatty=False)
-        r = http('--print=h', 'GET', httpbin.url + '/get', env=env)
+        r = http('--print=h', 'GET', httpbin + '/get', env=env)
         assert HTTP_OK in r
diff --git a/tests/test_downloads.py b/tests/test_downloads.py
index 9a567d88d6..b646a0e6a5 100644
--- a/tests/test_downloads.py
+++ b/tests/test_downloads.py
@@ -125,16 +125,14 @@ class TestDownloads:
     def test_actual_download(self, httpbin_both, httpbin):
         robots_txt = '/robots.txt'
         body = urlopen(httpbin + robots_txt).read().decode()
-        env = MockEnvironment(stdin_isatty=True, stdout_isatty=False)
+        env = MockEnvironment(stdin_isatty=True, stdout_isatty=False, show_displays=True)
         r = http('--download', httpbin_both.url + robots_txt, env=env)
         assert 'Downloading' in r.stderr
-        assert '[K' in r.stderr
-        assert 'Done' in r.stderr
         assert body == r
 
-    def test_download_with_Content_Length(self, httpbin_both):
+    def test_download_with_Content_Length(self, mock_env, httpbin_both):
         with open(os.devnull, 'w') as devnull:
-            downloader = Downloader(output_file=devnull, progress_file=devnull)
+            downloader = Downloader(mock_env, output_file=devnull)
             downloader.start(
                 initial_url='/',
                 final_response=Response(
@@ -148,11 +146,10 @@ def test_download_with_Content_Length(self, httpbin_both):
             downloader.chunk_downloaded(b'12345')
             downloader.finish()
             assert not downloader.interrupted
-            downloader._progress_reporter.join()
 
-    def test_download_no_Content_Length(self, httpbin_both):
+    def test_download_no_Content_Length(self, mock_env, httpbin_both):
         with open(os.devnull, 'w') as devnull:
-            downloader = Downloader(output_file=devnull, progress_file=devnull)
+            downloader = Downloader(mock_env, output_file=devnull)
             downloader.start(
                 final_response=Response(url=httpbin_both.url + '/'),
                 initial_url='/'
@@ -161,15 +158,14 @@ def test_download_no_Content_Length(self, httpbin_both):
             downloader.chunk_downloaded(b'12345')
             downloader.finish()
             assert not downloader.interrupted
-            downloader._progress_reporter.join()
 
-    def test_download_output_from_content_disposition(self, httpbin_both):
-        with tempfile.TemporaryDirectory() as tmp_dirname, open(os.devnull, 'w') as devnull:
+    def test_download_output_from_content_disposition(self, mock_env, httpbin_both):
+        with tempfile.TemporaryDirectory() as tmp_dirname:
             orig_cwd = os.getcwd()
             os.chdir(tmp_dirname)
             try:
                 assert not os.path.isfile('filename.bin')
-                downloader = Downloader(progress_file=devnull)
+                downloader = Downloader(mock_env)
                 downloader.start(
                     final_response=Response(
                         url=httpbin_both.url + '/',
@@ -184,7 +180,6 @@ def test_download_output_from_content_disposition(self, httpbin_both):
                 downloader.finish()
                 downloader.failed()  # Stop the reporter
                 assert not downloader.interrupted
-                downloader._progress_reporter.join()
 
                 # TODO: Auto-close the file in that case?
                 downloader._output_file.close()
@@ -192,9 +187,9 @@ def test_download_output_from_content_disposition(self, httpbin_both):
             finally:
                 os.chdir(orig_cwd)
 
-    def test_download_interrupted(self, httpbin_both):
+    def test_download_interrupted(self, mock_env, httpbin_both):
         with open(os.devnull, 'w') as devnull:
-            downloader = Downloader(output_file=devnull, progress_file=devnull)
+            downloader = Downloader(mock_env, output_file=devnull)
             downloader.start(
                 final_response=Response(
                     url=httpbin_both.url + '/',
@@ -205,17 +200,16 @@ def test_download_interrupted(self, httpbin_both):
             downloader.chunk_downloaded(b'1234')
             downloader.finish()
             assert downloader.interrupted
-            downloader._progress_reporter.join()
 
-    def test_download_resumed(self, httpbin_both):
+    def test_download_resumed(self, mock_env, httpbin_both):
         with tempfile.TemporaryDirectory() as tmp_dirname:
             file = os.path.join(tmp_dirname, 'file.bin')
             with open(file, 'a'):
                 pass
 
-            with open(os.devnull, 'w') as devnull, open(file, 'a+b') as output_file:
+            with open(file, 'a+b') as output_file:
                 # Start and interrupt the transfer after 3 bytes written
-                downloader = Downloader(output_file=output_file, progress_file=devnull)
+                downloader = Downloader(mock_env, output_file=output_file)
                 downloader.start(
                     final_response=Response(
                         url=httpbin_both.url + '/',
@@ -227,15 +221,14 @@ def test_download_resumed(self, httpbin_both):
                 downloader.finish()
                 downloader.failed()
                 assert downloader.interrupted
-                downloader._progress_reporter.join()
 
             # Write bytes
             with open(file, 'wb') as fh:
                 fh.write(b'123')
 
-            with open(os.devnull, 'w') as devnull, open(file, 'a+b') as output_file:
+            with open(file, 'a+b') as output_file:
                 # Resume the transfer
-                downloader = Downloader(output_file=output_file, progress_file=devnull, resume=True)
+                downloader = Downloader(mock_env, output_file=output_file, resume=True)
 
                 # Ensure `pre_request()` is working as expected too
                 headers = {}
@@ -253,7 +246,6 @@ def test_download_resumed(self, httpbin_both):
                 )
                 downloader.chunk_downloaded(b'45')
                 downloader.finish()
-                downloader._progress_reporter.join()
 
     def test_download_with_redirect_original_url_used_for_filename(self, httpbin):
         # Redirect from `/redirect/1` to `/get`.
@@ -263,7 +255,7 @@ def test_download_with_redirect_original_url_used_for_filename(self, httpbin):
             os.chdir(tmp_dirname)
             try:
                 assert os.listdir('.') == []
-                http('--download', httpbin.url + '/redirect/1')
+                http('--download', httpbin + '/redirect/1')
                 assert os.listdir('.') == [expected_filename]
             finally:
                 os.chdir(orig_cwd)
diff --git a/tests/test_encoding.py b/tests/test_encoding.py
index e9f50dc9bb..62814161ed 100644
--- a/tests/test_encoding.py
+++ b/tests/test_encoding.py
@@ -31,90 +31,90 @@ def test_charset_text_pairs():
 
 def test_unicode_headers(httpbin):
     # httpbin doesn't interpret UFT-8 headers
-    r = http(httpbin.url + '/headers', f'Test:{UNICODE}')
+    r = http(httpbin + '/headers', f'Test:{UNICODE}')
     assert HTTP_OK in r
 
 
 def test_unicode_headers_verbose(httpbin):
     # httpbin doesn't interpret UTF-8 headers
-    r = http('--verbose', httpbin.url + '/headers', f'Test:{UNICODE}')
+    r = http('--verbose', httpbin + '/headers', f'Test:{UNICODE}')
     assert HTTP_OK in r
     assert UNICODE in r
 
 
 def test_unicode_raw(httpbin):
-    r = http('--raw', f'test {UNICODE}', 'POST', httpbin.url + '/post')
+    r = http('--raw', f'test {UNICODE}', 'POST', httpbin + '/post')
     assert HTTP_OK in r
     assert r.json['data'] == f'test {UNICODE}'
 
 
 def test_unicode_raw_verbose(httpbin):
     r = http('--verbose', '--raw', f'test {UNICODE}',
-             'POST', httpbin.url + '/post')
+             'POST', httpbin + '/post')
     assert HTTP_OK in r
     assert UNICODE in r
 
 
 def test_unicode_form_item(httpbin):
-    r = http('--form', 'POST', httpbin.url + '/post', f'test={UNICODE}')
+    r = http('--form', 'POST', httpbin + '/post', f'test={UNICODE}')
     assert HTTP_OK in r
     assert r.json['form'] == {'test': UNICODE}
 
 
 def test_unicode_form_item_verbose(httpbin):
     r = http('--verbose', '--form',
-             'POST', httpbin.url + '/post', f'test={UNICODE}')
+             'POST', httpbin + '/post', f'test={UNICODE}')
     assert HTTP_OK in r
     assert UNICODE in r
 
 
 def test_unicode_json_item(httpbin):
-    r = http('--json', 'POST', httpbin.url + '/post', f'test={UNICODE}')
+    r = http('--json', 'POST', httpbin + '/post', f'test={UNICODE}')
     assert HTTP_OK in r
     assert r.json['json'] == {'test': UNICODE}
 
 
 def test_unicode_json_item_verbose(httpbin):
     r = http('--verbose', '--json',
-             'POST', httpbin.url + '/post', f'test={UNICODE}')
+             'POST', httpbin + '/post', f'test={UNICODE}')
     assert HTTP_OK in r
     assert UNICODE in r
 
 
 def test_unicode_raw_json_item(httpbin):
-    r = http('--json', 'POST', httpbin.url + '/post',
+    r = http('--json', 'POST', httpbin + '/post',
              f'test:={{ "{UNICODE}" : [ "{UNICODE}" ] }}')
     assert HTTP_OK in r
     assert r.json['json'] == {'test': {UNICODE: [UNICODE]}}
 
 
 def test_unicode_raw_json_item_verbose(httpbin):
-    r = http('--json', 'POST', httpbin.url + '/post',
+    r = http('--json', 'POST', httpbin + '/post',
              f'test:={{ "{UNICODE}" : [ "{UNICODE}" ] }}')
     assert HTTP_OK in r
     assert r.json['json'] == {'test': {UNICODE: [UNICODE]}}
 
 
 def test_unicode_url_query_arg_item(httpbin):
-    r = http(httpbin.url + '/get', f'test=={UNICODE}')
+    r = http(httpbin + '/get', f'test=={UNICODE}')
     assert HTTP_OK in r
     assert r.json['args'] == {'test': UNICODE}, r
 
 
 def test_unicode_url_query_arg_item_verbose(httpbin):
-    r = http('--verbose', httpbin.url + '/get', f'test=={UNICODE}')
+    r = http('--verbose', httpbin + '/get', f'test=={UNICODE}')
     assert HTTP_OK in r
     assert UNICODE in r
 
 
 def test_unicode_url(httpbin):
-    r = http(f'{httpbin.url}/get?test={UNICODE}')
+    r = http(f'{httpbin}/get?test={UNICODE}')
     assert HTTP_OK in r
     assert r.json['args'] == {'test': UNICODE}
 
 
 def test_unicode_url_verbose(httpbin):
-    r = http('--verbose', f'{httpbin.url}/get?test={UNICODE}')
+    r = http('--verbose', f'{httpbin}/get?test={UNICODE}')
     assert HTTP_OK in r
     assert r.json['args'] == {'test': UNICODE}
 
@@ -123,7 +123,7 @@ def test_unicode_basic_auth(httpbin):
     # it doesn't really authenticate us because httpbin
     # doesn't interpret the UTF-8-encoded auth
     http('--verbose', '--auth', f'test:{UNICODE}',
-         f'{httpbin.url}/basic-auth/test/{UNICODE}')
+         f'{httpbin}/basic-auth/test/{UNICODE}')
 
 
 def test_unicode_digest_auth(httpbin):
@@ -131,7 +131,7 @@ def test_unicode_digest_auth(httpbin):
     # doesn't interpret the UTF-8-encoded auth
     http('--auth-type=digest',
          '--auth', f'test:{UNICODE}',
-         f'{httpbin.url}/digest-auth/auth/test/{UNICODE}')
+         f'{httpbin}/digest-auth/auth/test/{UNICODE}')
 
 
 @pytest.mark.parametrize('charset, text', CHARSET_TEXT_PAIRS)
diff --git a/tests/test_exit_status.py b/tests/test_exit_status.py
index 4438d3485c..02fd2f1fe5 100644
--- a/tests/test_exit_status.py
+++ b/tests/test_exit_status.py
@@ -7,25 +7,25 @@
 def test_keyboard_interrupt_during_arg_parsing_exit_status(httpbin):
     with mock.patch('httpie.cli.definition.parser.parse_args',
                     side_effect=KeyboardInterrupt()):
-        r = http('GET', httpbin.url + '/get', tolerate_error_exit_status=True)
+        r = http('GET', httpbin + '/get', tolerate_error_exit_status=True)
         assert r.exit_status == ExitStatus.ERROR_CTRL_C
 
 
 def test_keyboard_interrupt_in_program_exit_status(httpbin):
     with mock.patch('httpie.core.program',
                     side_effect=KeyboardInterrupt()):
-        r = http('GET', httpbin.url + '/get', tolerate_error_exit_status=True)
+        r = http('GET', httpbin + '/get', tolerate_error_exit_status=True)
         assert r.exit_status == ExitStatus.ERROR_CTRL_C
 
 
 def test_ok_response_exits_0(httpbin):
-    r = http('GET', httpbin.url + '/get')
+    r = http('GET', httpbin + '/get')
     assert HTTP_OK in r
     assert r.exit_status == ExitStatus.SUCCESS
 
 
 def test_error_response_exits_0_without_check_status(httpbin):
-    r = http('GET', httpbin.url + '/status/500')
+    r = http('GET', httpbin + '/status/500')
     assert '500 INTERNAL SERVER ERROR' in r
     assert r.exit_status == ExitStatus.SUCCESS
     assert not r.stderr
@@ -33,7 +33,7 @@ def test_error_response_exits_0_without_check_status(httpbin):
 
 def test_timeout_exit_status(httpbin):
 
-    r = http('--timeout=0.01', 'GET', httpbin.url + '/delay/0.5',
+    r = http('--timeout=0.01', 'GET', httpbin + '/delay/0.5',
              tolerate_error_exit_status=True)
     assert r.exit_status == ExitStatus.ERROR_TIMEOUT
 
@@ -42,7 +42,7 @@ def test_3xx_check_status_exits_3_and_stderr_when_stdout_redirected(
         httpbin):
     env = MockEnvironment(stdout_isatty=False)
     r = http('--check-status', '--headers',
-             'GET', httpbin.url + '/status/301',
+             'GET', httpbin + '/status/301',
              env=env, tolerate_error_exit_status=True)
     assert '301 MOVED PERMANENTLY' in r
     assert r.exit_status == ExitStatus.ERROR_HTTP_3XX
@@ -51,7 +51,7 @@ def test_3xx_check_status_exits_3_and_stderr_when_stdout_redirected(
 
 def test_3xx_check_status_redirects_allowed_exits_0(httpbin):
     r = http('--check-status', '--follow',
-             'GET', httpbin.url + '/status/301',
+             'GET', httpbin + '/status/301',
              tolerate_error_exit_status=True)
     # The redirect will be followed so 200 is expected.
     assert HTTP_OK in r
@@ -59,7 +59,7 @@ def test_3xx_check_status_redirects_allowed_exits_0(httpbin):
 
 
 def test_4xx_check_status_exits_4(httpbin):
-    r = http('--check-status', 'GET', httpbin.url + '/status/401',
+    r = http('--check-status', 'GET', httpbin + '/status/401',
              tolerate_error_exit_status=True)
     assert '401 UNAUTHORIZED' in r
     assert r.exit_status == ExitStatus.ERROR_HTTP_4XX
@@ -68,7 +68,7 @@ def test_4xx_check_status_exits_4(httpbin):
 
 
 def test_5xx_check_status_exits_5(httpbin):
-    r = http('--check-status', 'GET', httpbin.url + '/status/500',
+    r = http('--check-status', 'GET', httpbin + '/status/500',
              tolerate_error_exit_status=True)
     assert '500 INTERNAL SERVER ERROR' in r
     assert r.exit_status == ExitStatus.ERROR_HTTP_5XX
diff --git a/tests/test_httpie.py b/tests/test_httpie.py
index f646d4e04a..5824340cda 100644
--- a/tests/test_httpie.py
+++ b/tests/test_httpie.py
@@ -36,7 +36,7 @@ def test_debug():
 def test_help():
     r = http('--help', tolerate_error_exit_status=True)
     assert r.exit_status == ExitStatus.SUCCESS
-    assert 'https://github.com/httpie/httpie/issues' in r
+    assert 'https://github.com/httpie/cli/issues' in r
 
 
 def test_version():
@@ -124,7 +124,7 @@ def test_POST_file(httpbin_both):
 
 def test_form_POST_file_redirected_stdin(httpbin):
     """
-    <https://github.com/httpie/httpie/issues/840>
+    <https://github.com/httpie/cli/issues/840>
 
     """
     with open(FILE_PATH, encoding=UTF8):
@@ -196,6 +196,14 @@ def test_unset_host_header(httpbin_both):
     assert 'Host' not in r.json['headers']  # default Host unset
 
 
+def test_unset_useragent_header(httpbin_both):
+    r = http('GET', httpbin_both + '/headers')
+    assert 'User-Agent' in r.json['headers']  # default User-Agent present
+
+    r = http('GET', httpbin_both + '/headers', 'User-Agent:')
+    assert 'User-Agent' not in r.json['headers']  # default User-Agent unset
+
+
 def test_headers_empty_value(httpbin_both):
     r = http('GET', httpbin_both + '/headers')
     assert r.json['headers']['Accept']  # default Accept has value
@@ -324,3 +332,41 @@ def test_json_input_preserve_order(httpbin_both):
     assert HTTP_OK in r
     assert r.json['data'] == \
         '{"order": {"map": {"1": "first", "2": "second"}}}'
+
+
+@pytest.mark.parametrize('extra_args, expected_content_length', [
+    (
+        ['Content-Length:0'],
+        '0'
+    ),
+    (
+        ['Content-Length:xxx'],
+        'xxx',
+    ),
+    (
+        ['--raw=data'],
+        '4'
+    ),
+    (
+        ['query[param]=something'],
+        '33'
+    )
+])
+def test_options_content_length_preservation(httpbin, extra_args, expected_content_length):
+    r = http(
+        '--offline',
+        'OPTIONS',
+        httpbin + '/anything',
+        *extra_args
+    )
+    assert f'Content-Length: {expected_content_length}' in r
+
+
+@pytest.mark.parametrize('method', ['options', 'Options', 'OPTIONS'])
+def test_options_dropping_redundant_content_length(httpbin, method):
+    r = http(
+        '--offline',
+        method,
+        httpbin + '/anything'
+    )
+    assert 'Content-Length' not in r
diff --git a/tests/test_httpie_cli.py b/tests/test_httpie_cli.py
new file mode 100644
index 0000000000..9da7163922
--- /dev/null
+++ b/tests/test_httpie_cli.py
@@ -0,0 +1,138 @@
+import pytest
+import shutil
+import json
+from httpie.sessions import SESSIONS_DIR_NAME
+from httpie.status import ExitStatus
+from httpie.cli.options import PARSER_SPEC_VERSION
+from tests.utils import DUMMY_HOST, httpie
+from tests.fixtures import SESSION_FILES_PATH, SESSION_FILES_NEW, SESSION_FILES_OLD, read_session_file
+
+
+OLD_SESSION_FILES_PATH = SESSION_FILES_PATH / 'old'
+
+
+@pytest.mark.requires_installation
+def test_plugins_cli_error_message_without_args():
+    # No arguments
+    result = httpie(no_debug=True)
+    assert result.exit_status == ExitStatus.ERROR
+    assert 'usage: ' in result.stderr
+    assert 'specify one of these' in result.stderr
+    assert 'please use the http/https commands:' in result.stderr
+
+
+@pytest.mark.parametrize(
+    'example',
+    [
+        'pie.dev/get',
+        'DELETE localhost:8000/delete',
+        'POST pie.dev/post header:value a=b header_2:value x:=1',
+    ],
+)
+@pytest.mark.requires_installation
+def test_plugins_cli_error_messages_with_example(example):
+    result = httpie(*example.split(), no_debug=True)
+    assert result.exit_status == ExitStatus.ERROR
+    assert 'usage: ' in result.stderr
+    assert f'http {example}' in result.stderr
+    assert f'https {example}' in result.stderr
+
+
+@pytest.mark.parametrize(
+    'example',
+    [
+        'cli',
+        'plugins',
+        'cli foo',
+        'plugins unknown',
+        'plugins unknown.com A:B c=d',
+        'unknown.com UNPARSABLE????SYNTAX',
+    ],
+)
+@pytest.mark.requires_installation
+def test_plugins_cli_error_messages_invalid_example(example):
+    result = httpie(*example.split(), no_debug=True)
+    assert result.exit_status == ExitStatus.ERROR
+    assert 'usage: ' in result.stderr
+    assert f'http {example}' not in result.stderr
+    assert f'https {example}' not in result.stderr
+
+
+HTTPIE_CLI_SESSIONS_UPGRADE_OPTIONS = [
+    (
+        # Default settings
+        [],
+        {'__host__': json.dumps(None)},
+    ),
+    (
+        # When --bind-cookies is applied, the __host__ becomes DUMMY_URL.
+        ['--bind-cookies'],
+        {'__host__': json.dumps(DUMMY_HOST)},
+    ),
+]
+
+
+@pytest.mark.parametrize(
+    'old_session_file, new_session_file', zip(SESSION_FILES_OLD, SESSION_FILES_NEW)
+)
+@pytest.mark.parametrize(
+    'extra_args, extra_variables',
+    HTTPIE_CLI_SESSIONS_UPGRADE_OPTIONS,
+)
+def test_httpie_sessions_upgrade(tmp_path, old_session_file, new_session_file, extra_args, extra_variables):
+    session_path = tmp_path / 'session.json'
+    shutil.copyfile(old_session_file, session_path)
+
+    result = httpie(
+        'cli', 'sessions', 'upgrade', *extra_args, DUMMY_HOST, str(session_path)
+    )
+    assert result.exit_status == ExitStatus.SUCCESS
+    assert read_session_file(session_path) == read_session_file(
+        new_session_file, extra_variables=extra_variables
+    )
+
+
+def test_httpie_sessions_upgrade_on_non_existent_file(tmp_path):
+    session_path = tmp_path / 'session.json'
+    result = httpie('cli', 'sessions', 'upgrade', DUMMY_HOST, str(session_path))
+    assert result.exit_status == ExitStatus.ERROR
+    assert 'does not exist' in result.stderr
+
+
+@pytest.mark.parametrize(
+    'extra_args, extra_variables',
+    HTTPIE_CLI_SESSIONS_UPGRADE_OPTIONS,
+)
+def test_httpie_sessions_upgrade_all(tmp_path, mock_env, extra_args, extra_variables):
+    mock_env._create_temp_config_dir = False
+    mock_env.config_dir = tmp_path / "config"
+
+    session_dir = mock_env.config_dir / SESSIONS_DIR_NAME / DUMMY_HOST
+    session_dir.mkdir(parents=True)
+    for original_session_file in SESSION_FILES_OLD:
+        shutil.copy(original_session_file, session_dir)
+
+    result = httpie(
+        'cli', 'sessions', 'upgrade-all', *extra_args, env=mock_env
+    )
+    assert result.exit_status == ExitStatus.SUCCESS
+
+    for refactored_session_file, expected_session_file in zip(
+        sorted(session_dir.glob("*.json")),
+        SESSION_FILES_NEW
+    ):
+        assert read_session_file(refactored_session_file) == read_session_file(
+            expected_session_file, extra_variables=extra_variables
+        )
+
+
+@pytest.mark.parametrize(
+    'load_func, extra_options', [
+        (json.loads, []),
+        (json.loads, ['--format=json'])
+    ]
+)
+def test_cli_export(load_func, extra_options):
+    response = httpie('cli', 'export-args', *extra_options)
+    assert response.exit_status == ExitStatus.SUCCESS
+    assert load_func(response)['version'] == PARSER_SPEC_VERSION
diff --git a/tests/test_json.py b/tests/test_json.py
index b454c03408..e758ebe7f4 100644
--- a/tests/test_json.py
+++ b/tests/test_json.py
@@ -5,7 +5,7 @@
 
 from httpie.cli.constants import PRETTY_MAP
 from httpie.cli.exceptions import ParseError
-from httpie.cli.nested_json import HTTPieSyntaxError
+from httpie.cli.nested_json import NestedJSONSyntaxError
 from httpie.output.formatters.colors import ColorFormatter
 from httpie.utils import JsonDictPreservingDuplicateKeys
 
@@ -157,7 +157,7 @@ def test_complex_json_arguments_with_non_json(httpbin, request_type, value):
             f'option:={json.dumps(value)}',
         )
 
-    cm.match("Can't use complex JSON value types")
+    cm.match('Cannot use complex JSON value types')
 
 
 @pytest.mark.parametrize(
@@ -321,7 +321,7 @@ def test_complex_json_arguments_with_non_json(httpbin, request_type, value):
                 'foo[][key]=value',
                 'foo[2][key 2]=value 2',
                 r'foo[2][key \[]=value 3',
-                r'[nesting][under][!][empty][?][\\key]:=4',
+                r'bar[nesting][under][!][empty][?][\\key]:=4',
             ],
             {
                 'foo': [
@@ -329,7 +329,7 @@ def test_complex_json_arguments_with_non_json(httpbin, request_type, value):
                     2,
                     {'key': 'value', 'key 2': 'value 2', 'key [': 'value 3'},
                 ],
-                '': {
+                'bar': {
                     'nesting': {'under': {'!': {'empty': {'?': {'\\key': 4}}}}}
                 },
             },
@@ -397,6 +397,58 @@ def test_complex_json_arguments_with_non_json(httpbin, request_type, value):
                 '2012': {'x': 2, '[3]': 4},
             },
         ),
+        (
+            [
+                r'a[\0]:=0',
+                r'a[\\1]:=1',
+                r'a[\\\2]:=2',
+                r'a[\\\\\3]:=3',
+                r'a[-1\\]:=-1',
+                r'a[-2\\\\]:=-2',
+                r'a[\\-3\\\\]:=-3',
+            ],
+            {
+                'a': {
+                    '0': 0,
+                    r'\1': 1,
+                    r'\\2': 2,
+                    r'\\\3': 3,
+                    '-1\\': -1,
+                    '-2\\\\': -2,
+                    '\\-3\\\\': -3,
+                }
+            },
+        ),
+        (
+            ['[]:=0', '[]:=1', '[5]:=5', '[]:=6', '[9]:=9'],
+            [0, 1, None, None, None, 5, 6, None, None, 9],
+        ),
+        (
+            ['=empty', 'foo=bar', 'bar[baz][quux]=tuut'],
+            {'': 'empty', 'foo': 'bar', 'bar': {'baz': {'quux': 'tuut'}}},
+        ),
+        (
+            [
+                r'\1=top level int',
+                r'\\1=escaped top level int',
+                r'\2[\3][\4]:=5',
+            ],
+            {
+                '1': 'top level int',
+                '\\1': 'escaped top level int',
+                '2': {'3': {'4': 5}},
+            },
+        ),
+        (
+            [':={"foo": {"bar": "baz"}}', 'top=val'],
+            {'': {'foo': {'bar': 'baz'}}, 'top': 'val'},
+        ),
+        (
+            ['[][a][b][]:=1', '[0][a][b][]:=2', '[][]:=2'],
+            [{'a': {'b': [1, 2]}}, [2]],
+        ),
+        ([':=[1,2,3]'], {'': [1, 2, 3]}),
+        ([':=[1,2,3]', 'foo=bar'], {'': [1, 2, 3], 'foo': 'bar'}),
     ],
 )
 def test_nested_json_syntax(input_json, expected_json, httpbin):
@@ -456,23 +508,23 @@ def test_nested_json_syntax(input_json, expected_json, httpbin):
         ),
         (
             ['foo=1', 'foo[key]:=2'],
-            "HTTPie Type Error: Can't perform 'key' based access on 'foo' which has a type of 'string' but this operation requires a type of 'object'.\nfoo[key]\n   ^^^^^",
+            "HTTPie Type Error: Cannot perform 'key' based access on 'foo' which has a type of 'string' but this operation requires a type of 'object'.\nfoo[key]\n   ^^^^^",
         ),
         (
             ['foo=1', 'foo[0]:=2'],
-            "HTTPie Type Error: Can't perform 'index' based access on 'foo' which has a type of 'string' but this operation requires a type of 'array'.\nfoo[0]\n   ^^^",
+            "HTTPie Type Error: Cannot perform 'index' based access on 'foo' which has a type of 'string' but this operation requires a type of 'array'.\nfoo[0]\n   ^^^",
         ),
         (
             ['foo=1', 'foo[]:=2'],
-            "HTTPie Type Error: Can't perform 'append' based access on 'foo' which has a type of 'string' but this operation requires a type of 'array'.\nfoo[]\n   ^^",
+            "HTTPie Type Error: Cannot perform 'append' based access on 'foo' which has a type of 'string' but this operation requires a type of 'array'.\nfoo[]\n   ^^",
         ),
         (
             ['data[key]=value', 'data[key 2]=value 2', 'data[0]=value'],
-            "HTTPie Type Error: Can't perform 'index' based access on 'data' which has a type of 'object' but this operation requires a type of 'array'.\ndata[0]\n    ^^^",
+            "HTTPie Type Error: Cannot perform 'index' based access on 'data' which has a type of 'object' but this operation requires a type of 'array'.\ndata[0]\n    ^^^",
         ),
         (
             ['data[key]=value', 'data[key 2]=value 2', 'data[]=value'],
-            "HTTPie Type Error: Can't perform 'append' based access on 'data' which has a type of 'object' but this operation requires a type of 'array'.\ndata[]\n    ^^",
+            "HTTPie Type Error: Cannot perform 'append' based access on 'data' which has a type of 'object' but this operation requires a type of 'array'.\ndata[]\n    ^^",
         ),
         (
             [
@@ -480,7 +532,7 @@ def test_nested_json_syntax(input_json, expected_json, httpbin):
                 'foo[bar][baz][5][]:=4',
                 'foo[bar][baz][key][]:=5',
             ],
-            "HTTPie Type Error: Can't perform 'key' based access on 'foo[bar][baz]' which has a type of 'array' but this operation requires a type of 'object'.\nfoo[bar][baz][key][]\n             ^^^^^",
+            "HTTPie Type Error: Cannot perform 'key' based access on 'foo[bar][baz]' which has a type of 'array' but this operation requires a type of 'object'.\nfoo[bar][baz][key][]\n             ^^^^^",
         ),
         (
             ['foo[-10]:=[1,2]'],
@@ -488,19 +540,42 @@ def test_nested_json_syntax(input_json, expected_json, httpbin):
         ),
         (
             ['foo[0]:=1', 'foo[]:=2', 'foo[\\2]:=3'],
-            "HTTPie Type Error: Can't perform 'key' based access on 'foo' which has a type of 'array' but this operation requires a type of 'object'.\nfoo[\\2]\n   ^^^^",
+            "HTTPie Type Error: Cannot perform 'key' based access on 'foo' which has a type of 'array' but this operation requires a type of 'object'.\nfoo[\\2]\n   ^^^^",
         ),
         (
             ['foo[\\1]:=2', 'foo[5]:=3'],
-            "HTTPie Type Error: Can't perform 'index' based access on 'foo' which has a type of 'object' but this operation requires a type of 'array'.\nfoo[5]\n   ^^^",
+            "HTTPie Type Error: Cannot perform 'index' based access on 'foo' which has a type of 'object' but this operation requires a type of 'array'.\nfoo[5]\n   ^^^",
+        ),
+        (
+            ['x=y', '[]:=2'],
+            "HTTPie Type Error: Cannot perform 'append' based access on '' which has a type of 'object' but this operation requires a type of 'array'.",
+        ),
+        (
+            ['[]:=2', 'x=y'],
+            "HTTPie Type Error: Cannot perform 'key' based access on '' which has a type of 'array' but this operation requires a type of 'object'.",
+        ),
+        (
+            [':=[1,2,3]', '[]:=4'],
+            "HTTPie Type Error: Cannot perform 'append' based access on '' which has a type of 'object' but this operation requires a type of 'array'.",
+        ),
+        (
+            ['[]:=4', ':=[1,2,3]'],
+            "HTTPie Type Error: Cannot perform 'key' based access on '' which has a type of 'array' but this operation requires a type of 'object'.",
         ),
     ],
 )
 def test_nested_json_errors(input_json, expected_error, httpbin):
-    with pytest.raises(HTTPieSyntaxError) as exc:
+    with pytest.raises(NestedJSONSyntaxError) as exc:
         http(httpbin + '/post', *input_json)
 
-    assert str(exc.value) == expected_error
+    exc_lines = str(exc.value).splitlines()
+    expected_lines = expected_error.splitlines()
+    if len(expected_lines) == 1:
+        # When the error offsets are not important, we'll just compare the actual
+        # error message.
+        exc_lines = exc_lines[:1]
+
+    assert expected_lines == exc_lines
 
 
 def test_nested_json_sparse_array(httpbin_both):
diff --git a/tests/test_output.py b/tests/test_output.py
index c68bfa9e38..2242177dbc 100644
--- a/tests/test_output.py
+++ b/tests/test_output.py
@@ -5,6 +5,7 @@
 import json
 import os
 import io
+import warnings
 from urllib.request import urlopen
 
 import pytest
@@ -17,10 +18,15 @@
 )
 from httpie.cli.definition import parser
 from httpie.encoding import UTF8
-from httpie.output.formatters.colors import get_lexer, PIE_STYLE_NAMES
+from httpie.output.formatters.colors import get_lexer, PIE_STYLE_NAMES, BUNDLED_STYLES
 from httpie.status import ExitStatus
 from .fixtures import XML_DATA_RAW, XML_DATA_FORMATTED
-from .utils import COLOR, CRLF, HTTP_OK, MockEnvironment, http, DUMMY_URL
+from .utils import COLOR, CRLF, HTTP_OK, MockEnvironment, http, DUMMY_URL, strip_colors
+
+
+# For ensuring test reproducibility, avoid using the unsorted
+# BUNDLED_STYLES set.
+SORTED_BUNDLED_STYLES = sorted(BUNDLED_STYLES)
 
 
 @pytest.mark.parametrize('stdout_isatty', [True, False])
@@ -48,7 +54,7 @@ def test_quiet(self, httpbin, quiet_flags):
             stdout_isatty=True,
             devnull=io.BytesIO()
         )
-        r = http(*quiet_flags, 'GET', httpbin.url + '/get', env=env)
+        r = http(*quiet_flags, 'GET', httpbin + '/get', env=env)
         assert env.stdout is env.devnull
         assert env.stderr is env.devnull
         assert HTTP_OK in r.devnull
@@ -85,6 +91,33 @@ def test_quiet_quiet_with_check_status_non_zero_pipe(self, httpbin):
         )
         assert 'http: warning: HTTP 500' in r.stderr
 
+    @mock.patch('httpie.core.program')
+    @pytest.mark.parametrize('flags, expected_warnings', [
+        ([], 1),
+        (['-q'], 1),
+        (['-qq'], 0),
+    ])
+    # Might fail on Windows due to interference from other warnings.
+    @pytest.mark.xfail
+    def test_quiet_on_python_warnings(self, test_patch, httpbin, flags, expected_warnings):
+        def warn_and_run(*args, **kwargs):
+            warnings.warn('warning!!')
+            return ExitStatus.SUCCESS
+
+        test_patch.side_effect = warn_and_run
+        with pytest.warns(None) as record:
+            http(*flags, httpbin + '/get')
+
+        assert len(record) == expected_warnings
+
+    def test_double_quiet_on_error(self, httpbin):
+        r = http(
+            '-qq', '--check-status', '$$$this.does.not.exist$$$',
+            tolerate_error_exit_status=True,
+        )
+        assert not r
+        assert 'Couldn’t resolve the given hostname' in r.stderr
+
     @pytest.mark.parametrize('quiet_flags', QUIET_SCENARIOS)
     @mock.patch('httpie.cli.argtypes.AuthCredentials._getpass',
                 new=lambda self, prompt: 'password')
@@ -101,7 +134,7 @@ def test_quiet_with_password_prompt(self, httpbin, quiet_flags):
         )
         r = http(
             *quiet_flags, '--auth', 'user', 'GET',
-            httpbin.url + '/basic-auth/user/password',
+            httpbin + '/basic-auth/user/password',
             env=env
         )
         assert env.stdout is env.devnull
@@ -114,7 +147,7 @@ def test_quiet_with_password_prompt(self, httpbin, quiet_flags):
     @pytest.mark.parametrize('output_options', ['-h', '-b', '-v', '-p=hH'])
     def test_quiet_with_explicit_output_options(self, httpbin, quiet_flags, output_options):
         env = MockEnvironment(stdin_isatty=True, stdout_isatty=True)
-        r = http(*quiet_flags, output_options, httpbin.url + '/get', env=env)
+        r = http(*quiet_flags, output_options, httpbin + '/get', env=env)
         assert env.stdout is env.devnull
         assert env.stderr is env.devnull
         assert r == ''
@@ -155,26 +188,26 @@ def test_quiet_with_output_redirection(self, tmp_path, httpbin, quiet_flags, wit
 class TestVerboseFlag:
     def test_verbose(self, httpbin):
         r = http('--verbose',
-                 'GET', httpbin.url + '/get', 'test-header:__test__')
+                 'GET', httpbin + '/get', 'test-header:__test__')
         assert HTTP_OK in r
         assert r.count('__test__') == 2
 
     def test_verbose_raw(self, httpbin):
         r = http('--verbose', '--raw', 'foo bar',
-                 'POST', httpbin.url + '/post')
+                 'POST', httpbin + '/post')
         assert HTTP_OK in r
         assert 'foo bar' in r
 
     def test_verbose_form(self, httpbin):
-        # https://github.com/httpie/httpie/issues/53
-        r = http('--verbose', '--form', 'POST', httpbin.url + '/post',
+        # https://github.com/httpie/cli/issues/53
+        r = http('--verbose', '--form', 'POST', httpbin + '/post',
                  'A=B', 'C=D')
         assert HTTP_OK in r
         assert 'A=B&C=D' in r
 
     def test_verbose_json(self, httpbin):
         r = http('--verbose',
-                 'POST', httpbin.url + '/post', 'foo=bar', 'baz=bar')
+                 'POST', httpbin + '/post', 'foo=bar', 'baz=bar')
         assert HTTP_OK in r
         assert '"baz": "bar"' in r
 
@@ -234,25 +267,43 @@ def test_ensure_meta_is_colored(httpbin, style):
     assert COLOR in r
 
 
+@pytest.mark.parametrize('style', SORTED_BUNDLED_STYLES)
+@pytest.mark.parametrize('msg', [
+    '',
+    ' ',
+    ' OK',
+    ' OK ',
+    ' CUSTOM ',
+])
+def test_ensure_status_code_is_shown_on_all_themes(http_server, style, msg):
+    env = MockEnvironment(colors=256)
+    r = http('--style', style,
+             http_server + '/status/msg',
+             '--raw', msg, env=env)
+
+    # Trailing space is stripped away.
+    assert 'HTTP/1.0 200' + msg.rstrip() in strip_colors(r)
+
+
 class TestPrettyOptions:
     """Test the --pretty handling."""
 
     def test_pretty_enabled_by_default(self, httpbin):
         env = MockEnvironment(colors=256)
-        r = http('GET', httpbin.url + '/get', env=env)
+        r = http('GET', httpbin + '/get', env=env)
         assert COLOR in r
 
     def test_pretty_enabled_by_default_unless_stdout_redirected(self, httpbin):
-        r = http('GET', httpbin.url + '/get')
+        r = http('GET', httpbin + '/get')
         assert COLOR not in r
 
     def test_force_pretty(self, httpbin):
         env = MockEnvironment(stdout_isatty=False, colors=256)
-        r = http('--pretty=all', 'GET', httpbin.url + '/get', env=env)
+        r = http('--pretty=all', 'GET', httpbin + '/get', env=env)
         assert COLOR in r
 
     def test_force_ugly(self, httpbin):
-        r = http('--pretty=none', 'GET', httpbin.url + '/get')
+        r = http('--pretty=none', 'GET', httpbin + '/get')
         assert COLOR not in r
 
     def test_subtype_based_pygments_lexer_match(self, httpbin):
@@ -261,14 +312,14 @@ def test_subtype_based_pygments_lexer_match(self, httpbin):
 
         """
         env = MockEnvironment(colors=256)
-        r = http('--print=B', '--pretty=all', httpbin.url + '/post',
+        r = http('--print=B', '--pretty=all', httpbin + '/post',
                  'Content-Type:text/foo+json', 'a=b', env=env)
         assert COLOR in r
 
     def test_colors_option(self, httpbin):
         env = MockEnvironment(colors=256)
         r = http('--print=B', '--pretty=colors',
-                 'GET', httpbin.url + '/get', 'a=b',
+                 'GET', httpbin + '/get', 'a=b',
                  env=env)
         # Tests that the JSON data isn't formatted.
         assert not r.strip().count('\n')
@@ -277,7 +328,7 @@ def test_colors_option(self, httpbin):
     def test_format_option(self, httpbin):
         env = MockEnvironment(colors=256)
         r = http('--print=B', '--pretty=format',
-                 'GET', httpbin.url + '/get', 'a=b',
+                 'GET', httpbin + '/get', 'a=b',
                  env=env)
         # Tests that the JSON data is formatted.
         assert r.strip().count('\n') == 2
@@ -304,25 +355,25 @@ def _validate_crlf(self, msg):
         return body
 
     def test_CRLF_headers_only(self, httpbin):
-        r = http('--headers', 'GET', httpbin.url + '/get')
+        r = http('--headers', 'GET', httpbin + '/get')
         body = self._validate_crlf(r)
         assert not body, f'Garbage after headers: {r!r}'
 
     def test_CRLF_ugly_response(self, httpbin):
-        r = http('--pretty=none', 'GET', httpbin.url + '/get')
+        r = http('--pretty=none', 'GET', httpbin + '/get')
         self._validate_crlf(r)
 
     def test_CRLF_formatted_response(self, httpbin):
-        r = http('--pretty=format', 'GET', httpbin.url + '/get')
+        r = http('--pretty=format', 'GET', httpbin + '/get')
         assert r.exit_status == ExitStatus.SUCCESS
         self._validate_crlf(r)
 
     def test_CRLF_ugly_request(self, httpbin):
-        r = http('--pretty=none', '--print=HB', 'GET', httpbin.url + '/get')
+        r = http('--pretty=none', '--print=HB', 'GET', httpbin + '/get')
         self._validate_crlf(r)
 
     def test_CRLF_formatted_request(self, httpbin):
-        r = http('--pretty=format', '--print=HB', 'GET', httpbin.url + '/get')
+        r = http('--pretty=format', '--print=HB', 'GET', httpbin + '/get')
         self._validate_crlf(r)
 
 
diff --git a/tests/test_parser_schema.py b/tests/test_parser_schema.py
new file mode 100644
index 0000000000..5b67137500
--- /dev/null
+++ b/tests/test_parser_schema.py
@@ -0,0 +1,63 @@
+from httpie.cli.options import ParserSpec, Qualifiers
+
+
+def test_parser_serialization():
+    small_parser = ParserSpec("test_parser")
+
+    group_1 = small_parser.add_group("group_1")
+    group_1.add_argument("regular_arg", help="regular arg", short_help="short")
+    group_1.add_argument(
+        "variadic_arg",
+        metavar="META",
+        help=Qualifiers.SUPPRESS,
+        nargs=Qualifiers.ZERO_OR_MORE
+    )
+    group_1.add_argument(
+        "-O",
+        "--opt-arg",
+        action="lazy_choices",
+        getter=lambda: ["opt_1", "opt_2"],
+        help_formatter=lambda state, *, isolation_mode: ", ".join(state),
+        short_help="short_help",
+    )
+
+    group_2 = small_parser.add_group("group_2")
+    group_2.add_argument("--typed", action="store_true", type=int)
+
+    definition = small_parser.finalize()
+    assert definition.serialize() == {
+        "name": "test_parser",
+        "description": None,
+        "groups": [
+            {
+                "name": "group_1",
+                "description": None,
+                "is_mutually_exclusive": False,
+                "args": [
+                    {
+                        "options": ["regular_arg"],
+                        "description": "regular arg",
+                        "short_description": "short",
+                    },
+                    {
+                        "options": ["variadic_arg"],
+                        "is_optional": True,
+                        "is_variadic": True,
+                        "metavar": "META",
+                    },
+                    {
+                        "options": ["-O", "--opt-arg"],
+                        "description": "opt_1, opt_2",
+                        "short_description": "short_help",
+                        "choices": ["opt_1", "opt_2"],
+                    },
+                ],
+            },
+            {
+                "name": "group_2",
+                "description": None,
+                "is_mutually_exclusive": False,
+                "args": [{"options": ["--typed"], "python_type_name": "int"}],
+            },
+        ],
+    }
diff --git a/tests/test_plugins_cli.py b/tests/test_plugins_cli.py
index 9f94821505..2aea0deaa0 100644
--- a/tests/test_plugins_cli.py
+++ b/tests/test_plugins_cli.py
@@ -1,13 +1,13 @@
 import pytest
 
 from httpie.status import ExitStatus
-from tests.utils import httpie
 from tests.utils.plugins_cli import parse_listing
 
 
 @pytest.mark.requires_installation
-def test_plugins_installation(httpie_plugins_success, interface, dummy_plugin):
-    lines = httpie_plugins_success('install', dummy_plugin.path)
+@pytest.mark.parametrize('cli_mode', [True, False])
+def test_plugins_installation(httpie_plugins_success, interface, dummy_plugin, cli_mode):
+    lines = httpie_plugins_success('install', dummy_plugin.path, cli_mode=cli_mode)
     assert lines[0].startswith(
         f'Installing {dummy_plugin.path}'
     )
@@ -29,8 +29,9 @@ def test_plugin_installation_with_custom_config(httpie_plugins_success, interfac
 
 
 @pytest.mark.requires_installation
-def test_plugins_listing(httpie_plugins_success, interface, dummy_plugin):
-    httpie_plugins_success('install', dummy_plugin.path)
+@pytest.mark.parametrize('cli_mode', [True, False])
+def test_plugins_listing(httpie_plugins_success, interface, dummy_plugin, cli_mode):
+    httpie_plugins_success('install', dummy_plugin.path, cli_mode=cli_mode)
     data = parse_listing(httpie_plugins_success('list'))
 
     assert data == {
@@ -51,9 +52,10 @@ def test_plugins_listing_multiple(interface, httpie_plugins_success, dummy_plugi
 
 
 @pytest.mark.requires_installation
-def test_plugins_uninstall(interface, httpie_plugins_success, dummy_plugin):
-    httpie_plugins_success('install', dummy_plugin.path)
-    httpie_plugins_success('uninstall', dummy_plugin.name)
+@pytest.mark.parametrize('cli_mode', [True, False])
+def test_plugins_uninstall(interface, httpie_plugins_success, dummy_plugin, cli_mode):
+    httpie_plugins_success('install', dummy_plugin.path, cli_mode=cli_mode)
+    httpie_plugins_success('uninstall', dummy_plugin.name, cli_mode=cli_mode)
     assert not interface.is_installed(dummy_plugin.name)
 
 
@@ -115,6 +117,8 @@ def test_plugins_double_uninstall(httpie_plugins, httpie_plugins_success, dummy_
     )
 
 
+# TODO: Make this work on CI (stopped working at some point)
+@pytest.mark.skip(reason='Doesn’t work in CI')
 @pytest.mark.requires_installation
 def test_plugins_upgrade(httpie_plugins, httpie_plugins_success, dummy_plugin):
     httpie_plugins_success("install", dummy_plugin.path)
@@ -136,7 +140,7 @@ def test_broken_plugins(httpie_plugins, httpie_plugins_success, dummy_plugin, br
         UserWarning,
         match=(
             f'While loading "{broken_plugin.name}", an error'
-            ' ocurred: broken plugin'
+            ' occurred: broken plugin'
         )
     ):
         data = parse_listing(httpie_plugins_success('list'))
@@ -149,45 +153,3 @@ def test_broken_plugins(httpie_plugins, httpie_plugins_success, dummy_plugin, br
     # No warning now, since it is uninstalled.
     data = parse_listing(httpie_plugins_success('list'))
     assert len(data) == 1
-
-
-@pytest.mark.requires_installation
-def test_plugins_cli_error_message_without_args():
-    # No arguments
-    result = httpie(no_debug=True)
-    assert result.exit_status == ExitStatus.ERROR
-    assert 'usage: ' in result.stderr
-    assert 'specify one of these' in result.stderr
-    assert 'please use the http/https commands:' in result.stderr
-
-
-@pytest.mark.parametrize(
-    'example', [
-        'pie.dev/get',
-        'DELETE localhost:8000/delete',
-        'POST pie.dev/post header:value a=b header_2:value x:=1'
-    ]
-)
-@pytest.mark.requires_installation
-def test_plugins_cli_error_messages_with_example(example):
-    result = httpie(*example.split(), no_debug=True)
-    assert result.exit_status == ExitStatus.ERROR
-    assert 'usage: ' in result.stderr
-    assert f'http {example}' in result.stderr
-    assert f'https {example}' in result.stderr
-
-
-@pytest.mark.parametrize(
-    'example', [
-        'plugins unknown',
-        'plugins unknown.com A:B c=d',
-        'unknown.com UNPARSABLE????SYNTAX',
-    ]
-)
-@pytest.mark.requires_installation
-def test_plugins_cli_error_messages_invalid_example(example):
-    result = httpie(*example.split(), no_debug=True)
-    assert result.exit_status == ExitStatus.ERROR
-    assert 'usage: ' in result.stderr
-    assert f'http {example}' not in result.stderr
-    assert f'https {example}' not in result.stderr
diff --git a/tests/test_redirects.py b/tests/test_redirects.py
index 81dcb2befd..f993f31171 100644
--- a/tests/test_redirects.py
+++ b/tests/test_redirects.py
@@ -13,7 +13,7 @@
 
 
 def test_follow_all_redirects_shown(httpbin):
-    r = http('--follow', '--all', httpbin.url + '/redirect/2')
+    r = http('--follow', '--all', httpbin + '/redirect/2')
     assert r.count('HTTP/1.1') == 3
     assert r.count('HTTP/1.1 302 FOUND', 2)
     assert HTTP_OK in r
@@ -21,14 +21,14 @@ def test_follow_all_redirects_shown(httpbin):
 
 @pytest.mark.parametrize('follow_flag', ['--follow', '-F'])
 def test_follow_without_all_redirects_hidden(httpbin, follow_flag):
-    r = http(follow_flag, httpbin.url + '/redirect/2')
+    r = http(follow_flag, httpbin + '/redirect/2')
     assert r.count('HTTP/1.1') == 1
     assert HTTP_OK in r
 
 
-@pytest.mark.xfail(True, reason="https://github.com/httpie/httpie/issues/1082")
+@pytest.mark.xfail(True, reason="https://github.com/httpie/cli/issues/1082")
 def test_follow_output_options_used_for_redirects(httpbin):
-    r = http('--follow', '--print=H', httpbin.url + '/redirect/2')
+    r = http('--follow', '--print=H', httpbin + '/redirect/2')
     assert r.count('GET /') == 1
     assert HTTP_OK not in r
 
@@ -38,7 +38,7 @@ def test_follow_all_output_options_used_for_redirects(httpbin):
              '--follow',
              '--all',
              '--print=H',
-             httpbin.url + '/redirect/2')
+             httpbin + '/redirect/2')
     assert r.count('GET /') == 3
     assert HTTP_OK not in r
 
@@ -50,7 +50,7 @@ def test_follow_all_output_options_used_for_redirects(httpbin):
 #              '--all',
 #              '--print=h',
 #              '--history-print=H',
-#              httpbin.url + '/redirect/2')
+#              httpbin + '/redirect/2')
 #     assert r.count('GET /') == 2
 #     assert 'HTTP/1.1 302 FOUND' not in r
 #     assert HTTP_OK in r
@@ -61,7 +61,7 @@ def test_max_redirects(httpbin):
     r = http(
         '--max-redirects=1',
         '--follow',
-        httpbin.url + '/redirect/3',
+        httpbin + '/redirect/3',
         tolerate_error_exit_status=True,
     )
     assert r.exit_status == ExitStatus.ERROR_TOO_MANY_REDIRECTS
@@ -72,11 +72,11 @@ def test_max_redirects(httpbin):
 def test_follow_redirect_with_repost(httpbin, status_code):
     r = http(
         '--follow',
-        httpbin.url + '/redirect-to',
+        httpbin + '/redirect-to',
         'A:A',
         'A:B',
         'B:B',
-        f'url=={httpbin.url}/post',
+        f'url=={httpbin}/post',
         f'status_code=={status_code}',
         '@' + FILE_PATH_ARG,
     )
@@ -92,11 +92,11 @@ def test_verbose_follow_redirect_with_repost(httpbin, status_code):
     r = http(
         '--follow',
         '--verbose',
-        httpbin.url + '/redirect-to',
+        httpbin + '/redirect-to',
         'A:A',
         'A:B',
         'B:B',
-        f'url=={httpbin.url}/post',
+        f'url=={httpbin}/post',
         f'status_code=={status_code}',
         '@' + FILE_PATH_ARG,
     )
diff --git a/tests/test_regressions.py b/tests/test_regressions.py
index ddcf4acf06..622d03d7ce 100644
--- a/tests/test_regressions.py
+++ b/tests/test_regressions.py
@@ -8,11 +8,11 @@
 
 def test_Host_header_overwrite(httpbin):
     """
-    https://github.com/httpie/httpie/issues/235
+    https://github.com/httpie/cli/issues/235
 
     """
     host = 'pie.dev'
-    url = httpbin.url + '/get'
+    url = httpbin + '/get'
     r = http('--print=hH', url, f'host:{host}')
     assert HTTP_OK in r
     assert r.lower().count('host:') == 1
@@ -22,7 +22,7 @@ def test_Host_header_overwrite(httpbin):
 @pytest.mark.skipif(is_windows, reason='Unix-only')
 def test_output_devnull(httpbin):
     """
-    https://github.com/httpie/httpie/issues/252
+    https://github.com/httpie/cli/issues/252
 
     """
     http('--output=/dev/null', httpbin + '/get')
@@ -31,11 +31,11 @@ def test_output_devnull(httpbin):
 def test_verbose_redirected_stdout_separator(httpbin):
     """
 
-    <https://github.com/httpie/httpie/issues/1006>
+    <https://github.com/httpie/cli/issues/1006>
     """
     r = http(
         '-v',
-        httpbin.url + '/post',
+        httpbin + '/post',
         'a=b',
         env=MockEnvironment(stdout_isatty=False),
     )
diff --git a/tests/test_sessions.py b/tests/test_sessions.py
index 5835993605..aa5243487d 100644
--- a/tests/test_sessions.py
+++ b/tests/test_sessions.py
@@ -1,12 +1,16 @@
 import json
 import os
 import shutil
+from contextlib import contextmanager
 from datetime import datetime
 from unittest import mock
+from pathlib import Path
+from typing import Iterator
 
 import pytest
 
 from .fixtures import FILE_PATH_ARG, UNICODE
+from httpie.context import Environment
 from httpie.encoding import UTF8
 from httpie.plugins import AuthPlugin
 from httpie.plugins.builtin import HTTPBasicAuth
@@ -14,7 +18,7 @@
 from httpie.sessions import Session
 from httpie.utils import get_expired_cookies
 from .test_auth_plugins import basic_auth
-from .utils import HTTP_OK, MockEnvironment, http, mk_config_dir
+from .utils import DUMMY_HOST, HTTP_OK, MockEnvironment, http, mk_config_dir
 from base64 import b64encode
 
 
@@ -78,7 +82,7 @@ def start_session(self, httpbin):
             '--session=test',
             '--auth=username:password',
             'GET',
-            httpbin.url + '/cookies/set?hello=world',
+            httpbin + '/cookies/set?hello=world',
             'Hello:World',
             env=self.env()
         )
@@ -88,7 +92,7 @@ def test_session_created_and_reused(self, httpbin):
         self.start_session(httpbin)
         # Verify that the session created in setup_method() has been used.
         r2 = http('--session=test',
-                  'GET', httpbin.url + '/get', env=self.env())
+                  'GET', httpbin + '/get', env=self.env())
         assert HTTP_OK in r2
         assert r2.json['headers']['Hello'] == 'World'
         assert r2.json['headers']['Cookie'] == 'hello=world'
@@ -97,19 +101,19 @@ def test_session_created_and_reused(self, httpbin):
     def test_session_update(self, httpbin):
         self.start_session(httpbin)
         # Get a response to a request from the original session.
-        r2 = http('--session=test', 'GET', httpbin.url + '/get',
+        r2 = http('--session=test', 'GET', httpbin + '/get',
                   env=self.env())
         assert HTTP_OK in r2
 
         # Make a request modifying the session data.
         r3 = http('--follow', '--session=test', '--auth=username:password2',
-                  'GET', httpbin.url + '/cookies/set?hello=world2',
+                  'GET', httpbin + '/cookies/set?hello=world2',
                   'Hello:World2',
                   env=self.env())
         assert HTTP_OK in r3
 
         # Get a response to a request from the updated session.
-        r4 = http('--session=test', 'GET', httpbin.url + '/get',
+        r4 = http('--session=test', 'GET', httpbin + '/get',
                   env=self.env())
         assert HTTP_OK in r4
         assert r4.json['headers']['Hello'] == 'World2'
@@ -120,7 +124,7 @@ def test_session_update(self, httpbin):
     def test_session_read_only(self, httpbin):
         self.start_session(httpbin)
         # Get a response from the original session.
-        r2 = http('--session=test', 'GET', httpbin.url + '/get',
+        r2 = http('--session=test', 'GET', httpbin + '/get',
                   env=self.env())
         assert HTTP_OK in r2
 
@@ -128,12 +132,12 @@ def test_session_read_only(self, httpbin):
         # with --session-read-only.
         r3 = http('--follow', '--session-read-only=test',
                   '--auth=username:password2', 'GET',
-                  httpbin.url + '/cookies/set?hello=world2', 'Hello:World2',
+                  httpbin + '/cookies/set?hello=world2', 'Hello:World2',
                   env=self.env())
         assert HTTP_OK in r3
 
         # Get a response from the updated session.
-        r4 = http('--session=test', 'GET', httpbin.url + '/get',
+        r4 = http('--session=test', 'GET', httpbin + '/get',
                   env=self.env())
         assert HTTP_OK in r4
 
@@ -147,17 +151,17 @@ def test_session_read_only(self, httpbin):
     def test_session_overwrite_header(self, httpbin):
         self.start_session(httpbin)
 
-        r2 = http('--session=test', 'GET', httpbin.url + '/get',
+        r2 = http('--session=test', 'GET', httpbin + '/get',
                   'Hello:World2', env=self.env())
         assert HTTP_OK in r2
         assert r2.json['headers']['Hello'] == 'World2'
 
-        r3 = http('--session=test', 'GET', httpbin.url + '/get',
+        r3 = http('--session=test', 'GET', httpbin + '/get',
                   'Hello:World2', 'Hello:World3', env=self.env())
         assert HTTP_OK in r3
         assert r3.json['headers']['Hello'] == 'World2,World3'
 
-        r3 = http('--session=test', 'GET', httpbin.url + '/get',
+        r3 = http('--session=test', 'GET', httpbin + '/get',
                   'Hello:', 'Hello:World3', env=self.env())
         assert HTTP_OK in r3
         assert 'Hello' not in r3.json['headers']['Hello']
@@ -168,12 +172,12 @@ class TestSession(SessionTestBase):
 
     def test_session_ignored_header_prefixes(self, httpbin):
         self.start_session(httpbin)
-        r1 = http('--session=test', 'GET', httpbin.url + '/get',
+        r1 = http('--session=test', 'GET', httpbin + '/get',
                   'Content-Type: text/plain',
                   'If-Unmodified-Since: Sat, 29 Oct 1994 19:43:31 GMT',
                   env=self.env())
         assert HTTP_OK in r1
-        r2 = http('--session=test', 'GET', httpbin.url + '/get',
+        r2 = http('--session=test', 'GET', httpbin + '/get',
                   env=self.env())
         assert HTTP_OK in r2
         assert 'Content-Type' not in r2.json['headers']
@@ -181,36 +185,36 @@ def test_session_ignored_header_prefixes(self, httpbin):
 
     def test_session_with_upload(self, httpbin):
         self.start_session(httpbin)
-        r = http('--session=test', '--form', '--verbose', 'POST', httpbin.url + '/post',
+        r = http('--session=test', '--form', '--verbose', 'POST', httpbin + '/post',
                  f'test-file@{FILE_PATH_ARG}', 'foo=bar', env=self.env())
         assert HTTP_OK in r
 
     def test_session_by_path(self, httpbin):
         self.start_session(httpbin)
         session_path = self.config_dir / 'session-by-path.json'
-        r1 = http('--session', str(session_path), 'GET', httpbin.url + '/get',
+        r1 = http('--session', str(session_path), 'GET', httpbin + '/get',
                   'Foo:Bar', env=self.env())
         assert HTTP_OK in r1
 
-        r2 = http('--session', str(session_path), 'GET', httpbin.url + '/get',
+        r2 = http('--session', str(session_path), 'GET', httpbin + '/get',
                   env=self.env())
         assert HTTP_OK in r2
         assert r2.json['headers']['Foo'] == 'Bar'
 
     def test_session_with_cookie_followed_by_another_header(self, httpbin):
         """
-        Make sure headers don’t get mutated — <https://github.com/httpie/httpie/issues/1126>
+        Make sure headers don’t get mutated — <https://github.com/httpie/cli/issues/1126>
         """
         self.start_session(httpbin)
         session_data = {
-            "headers": {
-                "cookie": "...",
-                "zzz": "..."
+            'headers': {
+                'cookie': '...',
+                'zzz': '...'
             }
         }
         session_path = self.config_dir / 'session-data.json'
         session_path.write_text(json.dumps(session_data))
-        r = http('--session', str(session_path), 'GET', httpbin.url + '/get',
+        r = http('--session', str(session_path), 'GET', httpbin + '/get',
                  env=self.env())
         assert HTTP_OK in r
         assert 'Zzz' in r
@@ -219,12 +223,12 @@ def test_session_unicode(self, httpbin):
         self.start_session(httpbin)
 
         r1 = http('--session=test', f'--auth=test:{UNICODE}',
-                  'GET', httpbin.url + '/get', f'Test:{UNICODE}',
+                  'GET', httpbin + '/get', f'Test:{UNICODE}',
                   env=self.env())
         assert HTTP_OK in r1
 
         r2 = http('--session=test', '--verbose', 'GET',
-                  httpbin.url + '/get', env=self.env())
+                  httpbin + '/get', env=self.env())
         assert HTTP_OK in r2
 
         # FIXME: Authorization *sometimes* is not present
@@ -235,25 +239,25 @@ def test_session_unicode(self, httpbin):
 
     def test_session_default_header_value_overwritten(self, httpbin):
         self.start_session(httpbin)
-        # https://github.com/httpie/httpie/issues/180
+        # https://github.com/httpie/cli/issues/180
         r1 = http('--session=test',
-                  httpbin.url + '/headers', 'User-Agent:custom',
+                  httpbin + '/headers', 'User-Agent:custom',
                   env=self.env())
         assert HTTP_OK in r1
         assert r1.json['headers']['User-Agent'] == 'custom'
 
-        r2 = http('--session=test', httpbin.url + '/headers', env=self.env())
+        r2 = http('--session=test', httpbin + '/headers', env=self.env())
         assert HTTP_OK in r2
         assert r2.json['headers']['User-Agent'] == 'custom'
 
     def test_download_in_session(self, tmp_path, httpbin):
-        # https://github.com/httpie/httpie/issues/412
+        # https://github.com/httpie/cli/issues/412
         self.start_session(httpbin)
         cwd = os.getcwd()
         os.chdir(tmp_path)
         try:
             http('--session=test', '--download',
-                 httpbin.url + '/get', env=self.env())
+                 httpbin + '/get', env=self.env())
         finally:
             os.chdir(cwd)
 
@@ -307,7 +311,7 @@ class Plugin(AuthPlugin):
             auth_type = 'test-prompted'
 
             def get_auth(self, username=None, password=None):
-                basic_auth_header = "Basic " + b64encode(self.raw_auth.encode()).strip().decode('latin1')
+                basic_auth_header = 'Basic ' + b64encode(self.raw_auth.encode()).strip().decode('latin1')
                 return basic_auth(basic_auth_header)
 
         plugin_manager.register(Plugin)
@@ -331,7 +335,7 @@ def get_auth(self, username=None, password=None):
         assert HTTP_OK in r1
         assert HTTP_OK in r2
 
-        # additional test for issue: https://github.com/httpie/httpie/issues/1098
+        # additional test for issue: https://github.com/httpie/cli/issues/1098
         with open(session_path) as session_file:
             session_file_lines = ''.join(session_file.readlines())
             assert "\"type\": \"test-prompted\"" in session_file_lines
@@ -359,7 +363,7 @@ def get_auth(self, username=None, password=None):
              )
         updated_session = json.loads(self.session_path.read_text(encoding=UTF8))
         assert updated_session['auth']['type'] == 'test-saved'
-        assert updated_session['auth']['raw_auth'] == "user:password"
+        assert updated_session['auth']['raw_auth'] == 'user:password'
         plugin_manager.unregister(Plugin)
 
 
@@ -368,12 +372,12 @@ class TestExpiredCookies(CookieTestBase):
     @pytest.mark.parametrize(
         'initial_cookie, expired_cookie',
         [
-            ({'id': {'value': 123}}, 'id'),
-            ({'id': {'value': 123}}, 'token')
+            ({'id': {'value': 123}}, {'name': 'id'}),
+            ({'id': {'value': 123}}, {'name': 'token'})
         ]
     )
-    def test_removes_expired_cookies_from_session_obj(self, initial_cookie, expired_cookie, httpbin):
-        session = Session(self.config_dir)
+    def test_removes_expired_cookies_from_session_obj(self, initial_cookie, expired_cookie, httpbin, mock_env):
+        session = Session(self.config_dir, env=mock_env, session_id=None, bound_host=None)
         session['cookies'] = initial_cookie
         session.remove_cookies([expired_cookie])
         assert expired_cookie not in session.cookies
@@ -382,7 +386,7 @@ def test_expired_cookies(self, httpbin):
         r = http(
             '--session', str(self.session_path),
             '--print=H',
-            httpbin.url + '/cookies/delete?cookie2',
+            httpbin + '/cookies/delete?cookie2',
         )
         assert 'Cookie: cookie1=foo; cookie2=foo' in r
 
@@ -423,7 +427,7 @@ def test_get_expired_cookies_using_max_age(self):
             ),
             (
                 # Checks we gracefully ignore expires date in invalid format.
-                # <https://github.com/httpie/httpie/issues/963>
+                # <https://github.com/httpie/cli/issues/963>
                 'pfg=; Expires=Sat, 19-Sep-2020 06:58:14 GMT+0000; Max-Age=0; path=/; domain=.tumblr.com; secure; HttpOnly',
                 None,
                 []
@@ -442,7 +446,7 @@ def test_get_expired_cookies_manages_multiple_cookie_headers(self, cookies, now,
 class TestCookieStorage(CookieTestBase):
 
     @pytest.mark.parametrize(
-        'new_cookies, new_cookies_dict, expected',
+        ['specified_cookie_header', 'new_cookies_dict', 'expected_effective_cookie_header'],
         [(
             'new=bar',
             {'new': 'bar'},
@@ -459,9 +463,9 @@ class TestCookieStorage(CookieTestBase):
             'chocolate=milk; cookie1=foo; cookie2=foo; new=bar'
         ),
             (
-            'new=bar;; chocolate=milk;;;',
+            'new=bar; chocolate=milk',
             {'new': 'bar', 'chocolate': 'milk'},
-            'cookie1=foo; cookie2=foo; new=bar'
+            'cookie1=foo; cookie2=foo; new=bar; chocolate=milk'
         ),
             (
             'new=bar; chocolate=milk;;;',
@@ -470,20 +474,35 @@ class TestCookieStorage(CookieTestBase):
         )
         ]
     )
-    def test_existing_and_new_cookies_sent_in_request(self, new_cookies, new_cookies_dict, expected, httpbin):
+    def test_existing_and_new_cookies_sent_in_request(
+        self,
+        specified_cookie_header,
+        new_cookies_dict,
+        expected_effective_cookie_header,
+        httpbin,
+    ):
         r = http(
             '--session', str(self.session_path),
             '--print=H',
-            httpbin.url,
-            'Cookie:' + new_cookies,
+            httpbin + '/get',
+            'Cookie:' + specified_cookie_header,
         )
-        # Note: cookies in response are in alphabetical order
-        assert f'Cookie: {expected}' in r
+        parsed_request_headers = {  # noqa
+            name: value for name, value in [
+                line.split(': ', 1)
+                for line in r.splitlines()
+                if line and ':' in line
+            ]
+        }
+        # Note: cookies in the request are in an undefined order.
+        expected_request_cookie_set = set(expected_effective_cookie_header.split('; '))
+        actual_request_cookie_set = set(parsed_request_headers['Cookie'].split('; '))
+        assert actual_request_cookie_set == expected_request_cookie_set
 
         updated_session = json.loads(self.session_path.read_text(encoding=UTF8))
+        assert 'Cookie' not in updated_session['headers']
         for name, value in new_cookies_dict.items():
-            assert name, value in updated_session['cookies']
-            assert 'Cookie' not in updated_session['headers']
+            assert updated_session['cookies'][name]['value'] == value
 
     @pytest.mark.parametrize(
         'cli_cookie, set_cookie, expected',
@@ -518,9 +537,316 @@ def test_cookie_storage_priority(self, cli_cookie, set_cookie, expected, httpbin
         """
         http(
             '--session', str(self.session_path),
-            httpbin.url + set_cookie,
+            httpbin + set_cookie,
             'Cookie:' + cli_cookie,
         )
         updated_session = json.loads(self.session_path.read_text(encoding=UTF8))
 
         assert updated_session['cookies']['cookie1']['value'] == expected
+
+
+@pytest.fixture
+def basic_session(httpbin, tmp_path):
+    session_path = tmp_path / 'session.json'
+    http(
+        '--session', str(session_path),
+        httpbin + '/get'
+    )
+    return session_path
+
+
+@contextmanager
+def open_session(path: Path, env: Environment, read_only: bool = False) -> Iterator[Session]:
+    session = Session(path, env, session_id='test', bound_host=DUMMY_HOST)
+    session.load()
+    yield session
+    if not read_only:
+        session.save()
+
+
+@contextmanager
+def open_raw_session(path: Path, read_only: bool = False) -> None:
+    with open(path) as stream:
+        raw_session = json.load(stream)
+
+    yield raw_session
+
+    if not read_only:
+        with open(path, 'w') as stream:
+            json.dump(raw_session, stream)
+
+
+def read_stderr(env: Environment) -> bytes:
+    env.stderr.seek(0)
+    stderr_data = env.stderr.read()
+    if isinstance(stderr_data, str):
+        return stderr_data.encode()
+    else:
+        return stderr_data
+
+
+def test_old_session_version_saved_as_is(basic_session, mock_env):
+    with open_session(basic_session, mock_env) as session:
+        session['__meta__'] = {'httpie': '0.0.1'}
+
+    with open_session(basic_session, mock_env, read_only=True) as session:
+        assert session['__meta__']['httpie'] == '0.0.1'
+
+
+def test_old_session_cookie_layout_warning(basic_session, mock_env):
+    with open_session(basic_session, mock_env) as session:
+        # Use the old layout & set a cookie
+        session['cookies'] = {}
+        session.cookies.set('foo', 'bar')
+
+    assert read_stderr(mock_env) == b''
+
+    with open_session(basic_session, mock_env, read_only=True) as session:
+        assert b'Outdated layout detected' in read_stderr(mock_env)
+
+
+@pytest.mark.parametrize('cookies, expect_warning', [
+    # Old-style cookie format
+    (
+        # Without 'domain' set
+        {'foo': {'value': 'bar'}},
+        True
+    ),
+    (
+        # With 'domain' set to empty string
+        {'foo': {'value': 'bar', 'domain': ''}},
+        True
+    ),
+    (
+        # With 'domain' set to null
+        {'foo': {'value': 'bar', 'domain': None}},
+        False,
+    ),
+    (
+        # With 'domain' set to a URL
+        {'foo': {'value': 'bar', 'domain': DUMMY_HOST}},
+        False,
+    ),
+    # New style cookie format
+    (
+        # Without 'domain' set
+        [{'name': 'foo', 'value': 'bar'}],
+        False
+    ),
+    (
+        # With 'domain' set to empty string
+        [{'name': 'foo', 'value': 'bar', 'domain': ''}],
+        False
+    ),
+    (
+        # With 'domain' set to null
+        [{'name': 'foo', 'value': 'bar', 'domain': None}],
+        False,
+    ),
+    (
+        # With 'domain' set to a URL
+        [{'name': 'foo', 'value': 'bar', 'domain': DUMMY_HOST}],
+        False,
+    ),
+])
+def test_cookie_security_warnings_on_raw_cookies(basic_session, mock_env, cookies, expect_warning):
+    with open_raw_session(basic_session) as raw_session:
+        raw_session['cookies'] = cookies
+
+    with open_session(basic_session, mock_env, read_only=True):
+        warning = b'Outdated layout detected'
+        stderr = read_stderr(mock_env)
+
+        if expect_warning:
+            assert warning in stderr
+        else:
+            assert warning not in stderr
+
+
+def test_old_session_cookie_layout_loading(basic_session, httpbin, mock_env):
+    with open_session(basic_session, mock_env) as session:
+        # Use the old layout & set a cookie
+        session['cookies'] = {}
+        session.cookies.set('foo', 'bar')
+
+    response = http(
+        '--session', str(basic_session),
+        httpbin + '/cookies'
+    )
+    assert response.json['cookies'] == {'foo': 'bar'}
+
+
+@pytest.mark.parametrize('layout_type', [
+    dict, list
+])
+def test_session_cookie_layout_preservation(basic_session, mock_env, layout_type):
+    with open_session(basic_session, mock_env) as session:
+        session['cookies'] = layout_type()
+        session.cookies.set('foo', 'bar')
+        session.save()
+
+    with open_session(basic_session, mock_env, read_only=True) as session:
+        assert isinstance(session['cookies'], layout_type)
+
+
+@pytest.mark.parametrize('layout_type', [
+    dict, list
+])
+def test_session_cookie_layout_preservation_on_new_cookies(basic_session, httpbin, mock_env, layout_type):
+    with open_session(basic_session, mock_env) as session:
+        session['cookies'] = layout_type()
+        session.cookies.set('foo', 'bar')
+        session.save()
+
+    http(
+        '--session', str(basic_session),
+        httpbin + '/cookies/set/baz/quux'
+    )
+
+    with open_session(basic_session, mock_env, read_only=True) as session:
+        assert isinstance(session['cookies'], layout_type)
+
+
+@pytest.mark.parametrize('headers, expect_warning', [
+    # Old-style header format
+    (
+        {},
+        False
+    ),
+    (
+        {'Foo': 'bar'},
+        True
+    ),
+    # New style header format
+    (
+        [],
+        False
+    ),
+    (
+        [{'name': 'Foo', 'value': 'Bar'}],
+        False
+    ),
+])
+def test_headers_old_layout_warning(basic_session, mock_env, headers, expect_warning):
+    with open_raw_session(basic_session) as raw_session:
+        raw_session['headers'] = headers
+
+    with open_session(basic_session, mock_env, read_only=True):
+        warning = b'Outdated layout detected'
+        stderr = read_stderr(mock_env)
+
+        if expect_warning:
+            assert warning in stderr
+        else:
+            assert warning not in stderr
+
+
+def test_outdated_layout_mixed(basic_session, mock_env):
+    with open_raw_session(basic_session) as raw_session:
+        raw_session['headers'] = {'Foo': 'Bar'}
+        raw_session['cookies'] = {
+            'cookie': {
+                'value': 'value'
+            }
+        }
+
+    with open_session(basic_session, mock_env, read_only=True):
+        stderr = read_stderr(mock_env)
+        # We should only see 1 warning.
+        assert stderr.count(b'Outdated layout') == 1
+
+
+def test_old_session_header_layout_loading(basic_session, httpbin, mock_env):
+    with open_session(basic_session, mock_env) as session:
+        # Use the old layout & set a header
+        session['headers'] = {}
+        session._headers.add('Foo', 'Bar')
+
+    response = http(
+        '--session', str(basic_session),
+        httpbin + '/get'
+    )
+    assert response.json['headers']['Foo'] == 'Bar'
+
+
+@pytest.mark.parametrize('layout_type', [
+    dict, list
+])
+def test_session_header_layout_preservation(basic_session, mock_env, layout_type):
+    with open_session(basic_session, mock_env) as session:
+        session['headers'] = layout_type()
+        session._headers.add('Foo', 'Bar')
+
+    with open_session(basic_session, mock_env, read_only=True) as session:
+        assert isinstance(session['headers'], layout_type)
+
+
+@pytest.mark.parametrize('layout_type', [
+    dict, list
+])
+def test_session_header_layout_preservation_on_new_headers(basic_session, httpbin, mock_env, layout_type):
+    with open_session(basic_session, mock_env) as session:
+        session['headers'] = layout_type()
+        session._headers.add('Foo', 'Bar')
+
+    http(
+        '--session', str(basic_session),
+        httpbin + '/get',
+        'Baz:Quux'
+    )
+
+    with open_session(basic_session, mock_env, read_only=True) as session:
+        assert isinstance(session['headers'], layout_type)
+
+
+def test_session_multiple_headers_with_same_name(basic_session, httpbin):
+    http(
+        '--session', str(basic_session),
+        httpbin + '/get',
+        'Foo:bar',
+        'Foo:baz',
+        'Foo:bar'
+    )
+
+    r = http(
+        '--offline',
+        '--session', str(basic_session),
+        httpbin + '/get',
+    )
+    assert r.count('Foo: bar') == 2
+    assert 'Foo: baz' in r
+
+
+@pytest.mark.parametrize(
+    'server, expected_cookies',
+    [
+        (
+            'localhost_http_server',
+            {'secure_cookie': 'foo', 'insecure_cookie': 'bar'}
+        ),
+        (
+            'remote_httpbin',
+            {'insecure_cookie': 'bar'}
+        )
+    ]
+)
+def test_secure_cookies_on_localhost(mock_env, tmp_path, server, expected_cookies, request):
+    server = request.getfixturevalue(server)
+    session_path = tmp_path / 'session.json'
+    http(
+        '--session', str(session_path),
+        server + '/cookies/set',
+        'secure_cookie==foo',
+        'insecure_cookie==bar'
+    )
+
+    with open_session(session_path, mock_env) as session:
+        for cookie in session.cookies:
+            if cookie.name == 'secure_cookie':
+                cookie.secure = True
+
+    r = http(
+        '--session', str(session_path),
+        server + '/cookies'
+    )
+    assert r.json == {'cookies': expected_cookies}
diff --git a/tests/test_ssl.py b/tests/test_ssl.py
index f930bf2826..6fb983785a 100644
--- a/tests/test_ssl.py
+++ b/tests/test_ssl.py
@@ -1,4 +1,3 @@
-import os
 import ssl
 
 import pytest
@@ -6,15 +5,17 @@
 import requests.exceptions
 import urllib3
 
-from httpie.ssl_ import AVAILABLE_SSL_VERSION_ARG_MAPPING, DEFAULT_SSL_CIPHERS
+from unittest import mock
+
+from httpie.ssl_ import AVAILABLE_SSL_VERSION_ARG_MAPPING, DEFAULT_SSL_CIPHERS_STRING
 from httpie.status import ExitStatus
 
-from .utils import HTTP_OK, TESTS_ROOT, http
+from .utils import HTTP_OK, TESTS_ROOT, IS_PYOPENSSL, http
 
 
 try:
     # Handle OpenSSL errors, if installed.
-    # See <https://github.com/httpie/httpie/issues/729>
+    # See <https://github.com/httpie/cli/issues/729>
     # noinspection PyUnresolvedReferences
     import OpenSSL.SSL
     ssl_errors = (
@@ -32,6 +33,15 @@
 CLIENT_KEY = str(CERTS_ROOT / 'client.key')
 CLIENT_PEM = str(CERTS_ROOT / 'client.pem')
 
+# In case of a regeneration, use the following commands
+# in the PWD_TESTS_ROOT:
+#   $ openssl genrsa -aes128 -passout pass:password 3072 > client.pem
+#   $ openssl req -new -x509 -nodes -days 10000 -key client.pem > client.pem
+PWD_TESTS_ROOT = CERTS_ROOT / 'password_protected'
+PWD_CLIENT_PEM = str(PWD_TESTS_ROOT / 'client.pem')
+PWD_CLIENT_KEY = str(PWD_TESTS_ROOT / 'client.key')
+PWD_CLIENT_PASS = 'password'
+PWD_CLIENT_INVALID_PASS = PWD_CLIENT_PASS + 'invalid'
 
 # We test against a local httpbin instance which uses a self-signed cert.
 # Requests without --verify=<CA_BUNDLE> will fail with a verification error.
@@ -136,11 +146,12 @@ def test_ciphers(httpbin_secure):
     r = http(
         httpbin_secure.url + '/get',
         '--ciphers',
-        DEFAULT_SSL_CIPHERS,
+        DEFAULT_SSL_CIPHERS_STRING,
     )
     assert HTTP_OK in r
 
 
+@pytest.mark.skipif(IS_PYOPENSSL, reason='pyOpenSSL uses a different message format.')
 def test_ciphers_none_can_be_selected(httpbin_secure):
     r = http(
         httpbin_secure.url + '/get',
@@ -158,10 +169,43 @@ def test_ciphers_none_can_be_selected(httpbin_secure):
 
 
 def test_pyopenssl_presence():
-    using_pyopenssl = os.getenv('HTTPIE_TEST_WITH_PYOPENSSL', '0')
-    if using_pyopenssl == '0':
+    if not IS_PYOPENSSL:
         assert not urllib3.util.ssl_.IS_PYOPENSSL
         assert not urllib3.util.IS_PYOPENSSL
     else:
         assert urllib3.util.ssl_.IS_PYOPENSSL
         assert urllib3.util.IS_PYOPENSSL
+
+
+@mock.patch('httpie.cli.argtypes.SSLCredentials._prompt_password',
+            new=lambda self, prompt: PWD_CLIENT_PASS)
+def test_password_protected_cert_prompt(httpbin_secure):
+    r = http(httpbin_secure + '/get',
+             '--cert', PWD_CLIENT_PEM,
+             '--cert-key', PWD_CLIENT_KEY)
+    assert HTTP_OK in r
+
+
+@mock.patch('httpie.cli.argtypes.SSLCredentials._prompt_password',
+            new=lambda self, prompt: PWD_CLIENT_INVALID_PASS)
+def test_password_protected_cert_prompt_invalid(httpbin_secure):
+    with pytest.raises(ssl_errors):
+        http(httpbin_secure + '/get',
+             '--cert', PWD_CLIENT_PEM,
+             '--cert-key', PWD_CLIENT_KEY)
+
+
+def test_password_protected_cert_cli_arg(httpbin_secure):
+    r = http(httpbin_secure + '/get',
+             '--cert', PWD_CLIENT_PEM,
+             '--cert-key', PWD_CLIENT_KEY,
+             '--cert-key-pass', PWD_CLIENT_PASS)
+    assert HTTP_OK in r
+
+
+def test_password_protected_cert_cli_arg_invalid(httpbin_secure):
+    with pytest.raises(ssl_errors):
+        http(httpbin_secure + '/get',
+             '--cert', PWD_CLIENT_PEM,
+             '--cert-key', PWD_CLIENT_KEY,
+             '--cert-key-pass', PWD_CLIENT_INVALID_PASS)
diff --git a/tests/test_stream.py b/tests/test_stream.py
index fb47378bf5..b0b9b8bde8 100644
--- a/tests/test_stream.py
+++ b/tests/test_stream.py
@@ -46,7 +46,7 @@ def test_pretty_redirected_stream(httpbin):
         stdout_isatty=False,
     )
     r = http('--verbose', '--pretty=all', '--stream', 'GET',
-             httpbin.url + '/get', env=env)
+             httpbin + '/get', env=env)
     assert BINARY_SUPPRESSED_NOTICE.decode() in r
 
 
@@ -57,7 +57,7 @@ def test_pretty_stream_ensure_full_stream_is_retrieved(httpbin):
         stdout_isatty=False,
     )
     r = http('--pretty=format', '--stream', 'GET',
-             httpbin.url + '/stream/3', env=env)
+             httpbin + '/stream/3', env=env)
     assert r.count('/stream/3') == 3
 
 
@@ -98,7 +98,7 @@ def test_encoded_stream(httpbin):
         stdin_isatty=False,
     )
     r = http('--pretty=none', '--stream', '--verbose', 'GET',
-             httpbin.url + '/get', env=env)
+             httpbin + '/get', env=env)
     assert BINARY_SUPPRESSED_NOTICE.decode() in r
 
 
@@ -111,7 +111,7 @@ def test_redirected_stream(httpbin):
         stdin=StdinBytesIO(BIN_FILE_PATH.read_bytes()),
     )
     r = http('--pretty=none', '--stream', '--verbose', 'GET',
-             httpbin.url + '/get', env=env)
+             httpbin + '/get', env=env)
     assert BIN_FILE_CONTENT in r
 
 
@@ -124,6 +124,10 @@ def test_redirected_stream(httpbin):
         ['Accept:text/event-stream'],
         3
     ),
+    (
+        ['Accept:text/event-stream; charset=utf-8'],
+        3
+    ),
     (
         ['Accept:text/plain'],
         1
@@ -136,7 +140,7 @@ def test_auto_streaming(http_server, extras, expected):
     assert len([
         call_arg
         for call_arg in env.stdout.write.call_args_list
-        if b'test' in call_arg[0][0]
+        if 'test' in call_arg[0][0]
     ]) == expected
 
 
diff --git a/tests/test_update_warnings.py b/tests/test_update_warnings.py
new file mode 100644
index 0000000000..e794162649
--- /dev/null
+++ b/tests/test_update_warnings.py
@@ -0,0 +1,240 @@
+import json
+import tempfile
+import time
+from contextlib import suppress
+from datetime import datetime
+from pathlib import Path
+
+import pytest
+
+from httpie.internal.daemon_runner import STATUS_FILE
+from httpie.internal.daemons import spawn_daemon
+from httpie.status import ExitStatus
+
+from .utils import PersistentMockEnvironment, http, httpie
+
+BUILD_CHANNEL = 'test'
+BUILD_CHANNEL_2 = 'test2'
+UNKNOWN_BUILD_CHANNEL = 'test3'
+
+HIGHEST_VERSION = '999.999.999'
+LOWEST_VERSION = '1.1.1'
+
+FIXED_DATE = datetime(1970, 1, 1).isoformat()
+
+MAX_ATTEMPT = 40
+MAX_TIMEOUT = 2.0
+
+
+def check_update_warnings(text):
+    return 'A new HTTPie release' in text
+
+
+@pytest.mark.requires_external_processes
+def test_daemon_runner():
+    # We have a pseudo daemon task called 'check_status'
+    # which creates a temp file called STATUS_FILE under
+    # user's temp directory. This test simply ensures that
+    # we create a daemon that successfully performs the
+    # external task.
+
+    status_file = Path(tempfile.gettempdir()) / STATUS_FILE
+    with suppress(FileNotFoundError):
+        status_file.unlink()
+
+    spawn_daemon('check_status')
+
+    for attempt in range(MAX_ATTEMPT):
+        time.sleep(MAX_TIMEOUT / MAX_ATTEMPT)
+        if status_file.exists():
+            break
+    else:
+        pytest.fail(
+            'Maximum number of attempts failed for daemon status check.'
+        )
+
+    assert status_file.exists()
+
+
+def test_fetch(static_fetch_data, without_warnings):
+    http('fetch_updates', '--daemon', env=without_warnings)
+
+    with open(without_warnings.config.version_info_file) as stream:
+        version_data = json.load(stream)
+
+    assert version_data['last_warned_date'] is None
+    assert version_data['last_fetched_date'] is not None
+    assert (
+        version_data['last_released_versions'][BUILD_CHANNEL]
+        == HIGHEST_VERSION
+    )
+    assert (
+        version_data['last_released_versions'][BUILD_CHANNEL_2]
+        == LOWEST_VERSION
+    )
+
+
+def test_fetch_dont_override_existing_layout(
+    static_fetch_data, without_warnings
+):
+    with open(without_warnings.config.version_info_file, 'w') as stream:
+        existing_layout = {
+            'last_warned_date': FIXED_DATE,
+            'last_fetched_date': FIXED_DATE,
+            'last_released_versions': {BUILD_CHANNEL: LOWEST_VERSION},
+        }
+        json.dump(existing_layout, stream)
+
+    http('fetch_updates', '--daemon', env=without_warnings)
+
+    with open(without_warnings.config.version_info_file) as stream:
+        version_data = json.load(stream)
+
+    # The "last updated at" field should not be modified, but the
+    # rest need to be updated.
+    assert version_data['last_warned_date'] == FIXED_DATE
+    assert version_data['last_fetched_date'] != FIXED_DATE
+    assert (
+        version_data['last_released_versions'][BUILD_CHANNEL]
+        == HIGHEST_VERSION
+    )
+
+
+def test_fetch_broken_json(static_fetch_data, without_warnings):
+    with open(without_warnings.config.version_info_file, 'w') as stream:
+        stream.write('$$broken$$')
+
+    http('fetch_updates', '--daemon', env=without_warnings)
+
+    with open(without_warnings.config.version_info_file) as stream:
+        version_data = json.load(stream)
+
+    assert (
+        version_data['last_released_versions'][BUILD_CHANNEL]
+        == HIGHEST_VERSION
+    )
+
+
+def test_check_updates_disable_warnings(
+    without_warnings, httpbin, fetch_update_mock
+):
+    r = http(httpbin + '/get', env=without_warnings)
+    assert not fetch_update_mock.called
+    assert not check_update_warnings(r.stderr)
+
+
+def test_check_updates_first_invocation(
+    with_warnings, httpbin, fetch_update_mock
+):
+    r = http(httpbin + '/get', env=with_warnings)
+    assert fetch_update_mock.called
+    assert not check_update_warnings(r.stderr)
+
+
+@pytest.mark.parametrize(
+    ['should_issue_warning', 'build_channel'],
+    [
+        (False, 'lower_build_channel'),
+        (True, 'higher_build_channel'),
+    ],
+)
+def test_check_updates_first_time_after_data_fetch(
+    with_warnings,
+    httpbin,
+    fetch_update_mock,
+    static_fetch_data,
+    should_issue_warning,
+    build_channel,
+    request,
+):
+    request.getfixturevalue(build_channel)
+    http('fetch_updates', '--daemon', env=with_warnings)
+    r = http(httpbin + '/get', env=with_warnings)
+
+    assert not fetch_update_mock.called
+    assert (not should_issue_warning) or check_update_warnings(r.stderr)
+
+
+def test_check_updates_first_time_after_data_fetch_unknown_build_channel(
+    with_warnings,
+    httpbin,
+    fetch_update_mock,
+    static_fetch_data,
+    unknown_build_channel,
+):
+    http('fetch_updates', '--daemon', env=with_warnings)
+    r = http(httpbin + '/get', env=with_warnings)
+
+    assert not fetch_update_mock.called
+    assert not check_update_warnings(r.stderr)
+
+
+def test_cli_check_updates(
+    static_fetch_data, higher_build_channel
+):
+    r = httpie('cli', 'check-updates')
+    assert r.exit_status == ExitStatus.SUCCESS
+    assert check_update_warnings(r)
+
+
+@pytest.mark.parametrize(
+    'build_channel', [
+        'lower_build_channel',
+        'unknown_build_channel',
+    ]
+)
+def test_cli_check_updates_not_shown(
+    static_fetch_data, build_channel, request
+):
+    request.getfixturevalue(build_channel)
+    r = httpie('cli', 'check-updates')
+    assert r.exit_status == ExitStatus.SUCCESS
+    assert not check_update_warnings(r)
+
+
+@pytest.fixture
+def with_warnings(tmp_path):
+    env = PersistentMockEnvironment()
+    env.config['version_info_file'] = tmp_path / 'version.json'
+    env.config['disable_update_warnings'] = False
+    return env
+
+
+@pytest.fixture
+def without_warnings(tmp_path):
+    env = PersistentMockEnvironment()
+    env.config['version_info_file'] = tmp_path / 'version.json'
+    env.config['disable_update_warnings'] = True
+    return env
+
+
+@pytest.fixture
+def fetch_update_mock(mocker):
+    mock_fetch = mocker.patch('httpie.internal.update_warnings.fetch_updates')
+    return mock_fetch
+
+
+@pytest.fixture
+def static_fetch_data(mocker):
+    mock_get = mocker.patch('requests.get')
+    mock_get.return_value.status_code = 200
+    mock_get.return_value.json.return_value = {
+        BUILD_CHANNEL: HIGHEST_VERSION,
+        BUILD_CHANNEL_2: LOWEST_VERSION,
+    }
+    return mock_get
+
+
+@pytest.fixture
+def unknown_build_channel(mocker):
+    mocker.patch('httpie.internal.update_warnings.BUILD_CHANNEL', UNKNOWN_BUILD_CHANNEL)
+
+
+@pytest.fixture
+def higher_build_channel(mocker):
+    mocker.patch('httpie.internal.update_warnings.BUILD_CHANNEL', BUILD_CHANNEL)
+
+
+@pytest.fixture
+def lower_build_channel(mocker):
+    mocker.patch('httpie.internal.update_warnings.BUILD_CHANNEL', BUILD_CHANNEL_2)
diff --git a/tests/test_uploads.py b/tests/test_uploads.py
index d9de3ac984..e6bb80ac70 100644
--- a/tests/test_uploads.py
+++ b/tests/test_uploads.py
@@ -18,6 +18,8 @@
 )
 from .fixtures import FILE_PATH_ARG, FILE_PATH, FILE_CONTENT
 
+MAX_RESPONSE_WAIT_TIME = 5
+
 
 def test_chunked_json(httpbin_with_chunked_support):
     r = http(
@@ -90,7 +92,7 @@ def test_chunked_raw(httpbin_with_chunked_support):
 
 
 @contextlib.contextmanager
-def stdin_processes(httpbin, *args):
+def stdin_processes(httpbin, *args, warn_threshold=0.1):
     process_1 = subprocess.Popen(
         [
             "cat"
@@ -110,7 +112,7 @@ def stdin_processes(httpbin, *args):
         stderr=subprocess.PIPE,
         env={
             **os.environ,
-            "HTTPIE_STDIN_READ_WARN_THRESHOLD": "0.1"
+            "HTTPIE_STDIN_READ_WARN_THRESHOLD": str(warn_threshold)
         }
     )
     try:
@@ -121,6 +123,7 @@ def stdin_processes(httpbin, *args):
 
 
 @pytest.mark.parametrize("wait", (True, False))
+@pytest.mark.requires_external_processes
 @pytest.mark.skipif(is_windows, reason="Windows doesn't support select() calls into files")
 def test_reading_from_stdin(httpbin, wait):
     with stdin_processes(httpbin) as (process_1, process_2):
@@ -131,13 +134,14 @@ def test_reading_from_stdin(httpbin, wait):
             time.sleep(1)
 
         try:
-            _, errs = process_2.communicate(timeout=0.25)
+            _, errs = process_2.communicate(timeout=MAX_RESPONSE_WAIT_TIME)
         except subprocess.TimeoutExpired:
             errs = b''
 
         assert b'> warning: no stdin data read in 0.1s' not in errs
 
 
+@pytest.mark.requires_external_processes
 @pytest.mark.skipif(is_windows, reason="Windows doesn't support select() calls into files")
 def test_stdin_read_warning(httpbin):
     with stdin_processes(httpbin) as (process_1, process_2):
@@ -146,13 +150,14 @@ def test_stdin_read_warning(httpbin):
         process_1.communicate(timeout=0.1, input=b"bleh\n")
 
         try:
-            _, errs = process_2.communicate(timeout=0.25)
+            _, errs = process_2.communicate(timeout=MAX_RESPONSE_WAIT_TIME)
         except subprocess.TimeoutExpired:
             errs = b''
 
         assert b'> warning: no stdin data read in 0.1s' in errs
 
 
+@pytest.mark.requires_external_processes
 @pytest.mark.skipif(is_windows, reason="Windows doesn't support select() calls into files")
 def test_stdin_read_warning_with_quiet(httpbin):
     with stdin_processes(httpbin, "-qq") as (process_1, process_2):
@@ -161,22 +166,36 @@ def test_stdin_read_warning_with_quiet(httpbin):
         process_1.communicate(timeout=0.1, input=b"bleh\n")
 
         try:
-            _, errs = process_2.communicate(timeout=0.25)
+            _, errs = process_2.communicate(timeout=MAX_RESPONSE_WAIT_TIME)
         except subprocess.TimeoutExpired:
             errs = b''
 
         assert b'> warning: no stdin data read in 0.1s' not in errs
 
 
+@pytest.mark.requires_external_processes
+@pytest.mark.skipif(is_windows, reason="Windows doesn't support select() calls into files")
+def test_stdin_read_warning_blocking_exit(httpbin):
+    # Use a very large number.
+    with stdin_processes(httpbin, warn_threshold=999) as (process_1, process_2):
+        # Wait before sending any data
+        time.sleep(1)
+        process_1.communicate(timeout=0.1, input=b"some input\n")
+
+        # If anything goes wrong, and the thread starts the block this
+        # will timeout and let us know.
+        process_2.communicate(timeout=MAX_RESPONSE_WAIT_TIME)
+
+
 class TestMultipartFormDataFileUpload:
 
     def test_non_existent_file_raises_parse_error(self, httpbin):
         with pytest.raises(ParseError):
             http('--form',
-                 'POST', httpbin.url + '/post', 'foo@/__does_not_exist__')
+                 'POST', httpbin + '/post', 'foo@/__does_not_exist__')
 
     def test_upload_ok(self, httpbin):
-        r = http('--form', '--verbose', 'POST', httpbin.url + '/post',
+        r = http('--form', '--verbose', 'POST', httpbin + '/post',
                  f'test-file@{FILE_PATH_ARG}', 'foo=bar')
         assert HTTP_OK in r
         assert 'Content-Disposition: form-data; name="foo"' in r
@@ -187,7 +206,7 @@ def test_upload_ok(self, httpbin):
         assert 'Content-Type: text/plain' in r
 
     def test_upload_multiple_fields_with_the_same_name(self, httpbin):
-        r = http('--form', '--verbose', 'POST', httpbin.url + '/post',
+        r = http('--form', '--verbose', 'POST', httpbin + '/post',
                  f'test-file@{FILE_PATH_ARG}',
                  f'test-file@{FILE_PATH_ARG}')
         assert HTTP_OK in r
@@ -202,7 +221,7 @@ def test_upload_custom_content_type(self, httpbin):
         r = http(
             '--form',
             '--verbose',
-            httpbin.url + '/post',
+            httpbin + '/post',
             f'test-file@{FILE_PATH_ARG};type=image/vnd.microsoft.icon'
         )
         assert HTTP_OK in r
@@ -216,7 +235,7 @@ def test_form_no_files_urlencoded(self, httpbin):
         r = http(
             '--form',
             '--verbose',
-            httpbin.url + '/post',
+            httpbin + '/post',
             'AAAA=AAA',
             'BBB=BBB',
         )
@@ -227,7 +246,7 @@ def test_multipart(self, httpbin):
         r = http(
             '--verbose',
             '--multipart',
-            httpbin.url + '/post',
+            httpbin + '/post',
             'AAAA=AAA',
             'BBB=BBB',
         )
@@ -242,7 +261,7 @@ def test_form_multipart_custom_boundary(self, httpbin):
             '--check-status',
             '--multipart',
             f'--boundary={boundary}',
-            httpbin.url + '/post',
+            httpbin + '/post',
             'AAAA=AAA',
             'BBB=BBB',
         )
@@ -256,7 +275,7 @@ def test_multipart_custom_content_type_boundary_added(self, httpbin):
             '--check-status',
             '--multipart',
             f'--boundary={boundary}',
-            httpbin.url + '/post',
+            httpbin + '/post',
             'Content-Type: multipart/magic',
             'AAAA=AAA',
             'BBB=BBB',
@@ -273,7 +292,7 @@ def test_multipart_custom_content_type_boundary_preserved(self, httpbin):
             '--check-status',
             '--multipart',
             f'--boundary={boundary_in_body}',
-            httpbin.url + '/post',
+            httpbin + '/post',
             f'Content-Type: multipart/magic; boundary={boundary_in_header}',
             'AAAA=AAA',
             'BBB=BBB',
@@ -323,7 +342,7 @@ class TestRequestBodyFromFilePath:
     def test_request_body_from_file_by_path(self, httpbin):
         r = http(
             '--verbose',
-            'POST', httpbin.url + '/post',
+            'POST', httpbin + '/post',
             '@' + FILE_PATH_ARG,
         )
         assert HTTP_OK in r
@@ -344,7 +363,7 @@ def test_request_body_from_file_by_path_chunked(self, httpbin_with_chunked_suppo
     def test_request_body_from_file_by_path_with_explicit_content_type(
             self, httpbin):
         r = http('--verbose',
-                 'POST', httpbin.url + '/post', '@' + FILE_PATH_ARG,
+                 'POST', httpbin + '/post', '@' + FILE_PATH_ARG,
                  'Content-Type:text/plain; charset=UTF-8')
         assert HTTP_OK in r
         assert FILE_CONTENT in r
@@ -353,7 +372,7 @@ def test_request_body_from_file_by_path_with_explicit_content_type(
     def test_request_body_from_file_by_path_no_field_name_allowed(
             self, httpbin):
         env = MockEnvironment(stdin_isatty=True)
-        r = http('POST', httpbin.url + '/post', 'field-name@' + FILE_PATH_ARG,
+        r = http('POST', httpbin + '/post', 'field-name@' + FILE_PATH_ARG,
                  env=env, tolerate_error_exit_status=True)
         assert 'perhaps you meant --form?' in r.stderr
 
@@ -362,7 +381,7 @@ def test_request_body_from_file_by_path_no_data_items_allowed(
         env = MockEnvironment(stdin_isatty=False)
         r = http(
             'POST',
-            httpbin.url + '/post',
+            httpbin + '/post',
             '@' + FILE_PATH_ARG, 'foo=bar',
             env=env,
             tolerate_error_exit_status=True,
@@ -374,7 +393,7 @@ def test_multiple_request_bodies_from_file_by_path(self, httpbin):
         env = MockEnvironment(stdin_isatty=True)
         r = http(
             '--verbose',
-            'POST', httpbin.url + '/post',
+            'POST', httpbin + '/post',
             '@' + FILE_PATH_ARG,
             '@' + FILE_PATH_ARG,
             env=env,
diff --git a/tests/test_windows.py b/tests/test_windows.py
index b30c7a5084..80d392ae8f 100644
--- a/tests/test_windows.py
+++ b/tests/test_windows.py
@@ -12,7 +12,7 @@ class TestWindowsOnly:
                         reason='this test for some reason kills the process')
     def test_windows_colorized_output(self, httpbin):
         # Spits out the colorized output.
-        http(httpbin.url + '/get', env=Environment())
+        http(httpbin + '/get', env=Environment())
 
 
 class TestFakeWindows:
@@ -20,6 +20,6 @@ def test_output_file_pretty_not_allowed_on_windows(self, tmp_path, httpbin):
         env = MockEnvironment(is_windows=True)
         output_file = tmp_path / 'test_output_file_pretty_not_allowed_on_windows'
         r = http('--output', str(output_file),
-                 '--pretty=all', 'GET', httpbin.url + '/get',
+                 '--pretty=all', 'GET', httpbin + '/get',
                  env=env, tolerate_error_exit_status=True)
         assert 'Only terminal output can be colorized on Windows' in r.stderr
diff --git a/tests/utils/__init__.py b/tests/utils/__init__.py
index f8954565c5..0a9af608a5 100644
--- a/tests/utils/__init__.py
+++ b/tests/utils/__init__.py
@@ -1,10 +1,14 @@
 """Utilities for HTTPie test suite."""
 import re
 import shlex
+import os
 import sys
 import time
 import json
 import tempfile
+import warnings
+import pytest
+from contextlib import suppress
 from io import BytesIO
 from pathlib import Path
 from typing import Any, Optional, Union, List, Iterable
@@ -14,19 +18,26 @@
 
 from httpie.status import ExitStatus
 from httpie.config import Config
+from httpie.encoding import UTF8
 from httpie.context import Environment
+from httpie.utils import url_as_host
 
 
+REMOTE_HTTPBIN_DOMAIN = 'pie.dev'
+
 # pytest-httpbin currently does not support chunked requests:
 # <https://github.com/kevin1024/pytest-httpbin/issues/33>
 # <https://github.com/kevin1024/pytest-httpbin/issues/28>
 HTTPBIN_WITH_CHUNKED_SUPPORT_DOMAIN = 'pie.dev'
 HTTPBIN_WITH_CHUNKED_SUPPORT = 'http://' + HTTPBIN_WITH_CHUNKED_SUPPORT_DOMAIN
 
+IS_PYOPENSSL = os.getenv('HTTPIE_TEST_WITH_PYOPENSSL', '0') == '1'
 
 TESTS_ROOT = Path(__file__).parent.parent
 CRLF = '\r\n'
 COLOR = '\x1b['
+COLOR_RE = re.compile(r'\x1b\[\d+(;\d+)*?m', re.MULTILINE)
+
 HTTP_OK = '200 OK'
 # noinspection GrazieInspection
 HTTP_OK_COLOR = (
@@ -36,6 +47,15 @@
 )
 
 DUMMY_URL = 'http://this-should.never-resolve'  # Note: URL never fetched
+DUMMY_HOST = url_as_host(DUMMY_URL)
+
+# We don't want hundreds of subprocesses trying to access GitHub API
+# during the tests.
+Config.DEFAULTS['disable_update_warnings'] = True
+
+
+def strip_colors(colorized_msg: str) -> str:
+    return COLOR_RE.sub('', colorized_msg)
 
 
 def mk_config_dir() -> Path:
@@ -48,6 +68,59 @@ def add_auth(url, auth):
     return f'{proto}://{auth}@{rest}'
 
 
+class Encoder:
+    """
+    Encode binary fragments into a text stream. This is used
+    to embed raw binary data (which can't be decoded) into the
+    fake standard output we use on MockEnvironment.
+
+    Each data fragment is embedded by it's hash:
+        "Some data hash(XXX) more data."
+
+    Which then later converted back to a bytes object:
+        b"Some data <real data> more data."
+    """
+
+    TEMPLATE = 'hash({})'
+
+    STR_PATTERN = re.compile(r'hash\((.*)\)')
+    BYTES_PATTERN = re.compile(rb'hash\((.*)\)')
+
+    def __init__(self):
+        self.substitutions = {}
+
+    def substitute(self, data: bytes) -> str:
+        idx = hash(data)
+        self.substitutions[idx] = data
+        return self.TEMPLATE.format(idx)
+
+    def decode(self, data: str) -> Union[str, bytes]:
+        if self.STR_PATTERN.search(data) is None:
+            return data
+
+        raw_data = data.encode()
+        return self.BYTES_PATTERN.sub(
+            lambda match: self.substitutions[int(match.group(1))],
+            raw_data
+        )
+
+
+class FakeBytesIOBuffer(BytesIO):
+
+    def __init__(self, original, encoder, *args, **kwargs):
+        self.original_buffer = original
+        self.encoder = encoder
+        super().__init__(*args, **kwargs)
+
+    def write(self, data):
+        try:
+            self.original_buffer.write(data.decode(UTF8))
+        except UnicodeDecodeError:
+            self.original_buffer.write(self.encoder.substitute(data))
+        finally:
+            self.original_buffer.flush()
+
+
 class StdinBytesIO(BytesIO):
     """To be used for `MockEnvironment.stdin`"""
     len = 0  # See `prepare_request_body()`
@@ -59,17 +132,23 @@ class MockEnvironment(Environment):
     stdin_isatty = True
     stdout_isatty = True
     is_windows = False
+    show_displays = False
 
-    def __init__(self, create_temp_config_dir=True, *, stdout_mode='b', **kwargs):
+    def __init__(self, create_temp_config_dir=True, **kwargs):
+        self._encoder = Encoder()
         if 'stdout' not in kwargs:
-            kwargs['stdout'] = tempfile.TemporaryFile(
-                mode=f'w+{stdout_mode}',
-                prefix='httpie_stdout'
+            kwargs['stdout'] = tempfile.NamedTemporaryFile(
+                mode='w+t',
+                prefix='httpie_stderr',
+                newline='',
+                encoding=UTF8,
             )
+            kwargs['stdout'].buffer = FakeBytesIOBuffer(kwargs['stdout'], self._encoder)
         if 'stderr' not in kwargs:
             kwargs['stderr'] = tempfile.TemporaryFile(
                 mode='w+t',
-                prefix='httpie_stderr'
+                prefix='httpie_stderr',
+                encoding=UTF8,
             )
         super().__init__(**kwargs)
         self._create_temp_config_dir = create_temp_config_dir
@@ -88,8 +167,10 @@ def create_temp_config_dir(self):
         self._delete_config_dir = True
 
     def cleanup(self):
+        self.devnull.close()
         self.stdout.close()
         self.stderr.close()
+        warnings.resetwarnings()
         if self._delete_config_dir:
             assert self._temp_dir in self.config_dir.parents
             from shutil import rmtree
@@ -103,6 +184,11 @@ def __del__(self):
             pass
 
 
+class PersistentMockEnvironment(MockEnvironment):
+    def cleanup(self):
+        pass
+
+
 class BaseCLIResponse:
     """
     Represents the result of simulated `$ http' invocation via `http()`.
@@ -124,11 +210,22 @@ class BaseCLIResponse:
     complete_args: List[str] = []
 
     @property
-    def command(self):
+    def command(self):  # noqa: F811
         cmd = ' '.join(shlex.quote(arg) for arg in ['http', *self.args])
         # pytest-httpbin to real httpbin.
         return re.sub(r'127\.0\.0\.1:\d+', 'httpbin.org', cmd)
 
+    @classmethod
+    def from_raw_data(self, data: Union[str, bytes]) -> 'BaseCLIResponse':
+        if isinstance(data, bytes):
+            with suppress(UnicodeDecodeError):
+                data = data.decode()
+
+        if isinstance(data, bytes):
+            return BytesCLIResponse(data)
+        else:
+            return StrCLIResponse(data)
+
 
 class BytesCLIResponse(bytes, BaseCLIResponse):
     """
@@ -179,6 +276,13 @@ class ExitStatusError(Exception):
     pass
 
 
+@pytest.fixture
+def mock_env() -> MockEnvironment:
+    env = MockEnvironment()
+    yield env
+    env.cleanup()
+
+
 def normalize_args(args: Iterable[Any]) -> List[str]:
     return [str(arg) for arg in args]
 
@@ -206,7 +310,7 @@ def httpie(
     env.stdout.seek(0)
     env.stderr.seek(0)
     try:
-        response = StrCLIResponse(env.stdout.read())
+        response = BaseCLIResponse.from_raw_data(env.stdout.read())
         response.stderr = env.stderr.read()
         response.exit_status = exit_status
         response.args = cli_args
@@ -256,7 +360,7 @@ def http(
     $ http --auth=user:password GET pie.dev/basic-auth/user/password
 
         >>> httpbin = getfixture('httpbin')
-        >>> r = http('-a', 'user:pw', httpbin.url + '/basic-auth/user/pw')
+        >>> r = http('-a', 'user:pw', httpbin + '/basic-auth/user/pw')
         >>> type(r) == StrCLIResponse
         True
         >>> r.exit_status is ExitStatus.SUCCESS
@@ -324,12 +428,11 @@ def dump_stderr():
         devnull.seek(0)
         output = stdout.read()
         devnull_output = devnull.read()
-        try:
-            output = output.decode()
-        except UnicodeDecodeError:
-            r = BytesCLIResponse(output)
-        else:
-            r = StrCLIResponse(output)
+
+        if hasattr(env, '_encoder'):
+            output = env._encoder.decode(output)
+
+        r = BaseCLIResponse.from_raw_data(output)
 
         try:
             devnull_output = devnull_output.decode()
@@ -349,7 +452,4 @@ def dump_stderr():
         return r
 
     finally:
-        devnull.close()
-        stdout.close()
-        stderr.close()
         env.cleanup()
diff --git a/tests/utils/http_server.py b/tests/utils/http_server.py
index fc8f2b07a2..86cc069c57 100644
--- a/tests/utils/http_server.py
+++ b/tests/utils/http_server.py
@@ -1,9 +1,12 @@
 import threading
+import json
 
 from collections import defaultdict
+from contextlib import contextmanager
 from http import HTTPStatus
+from http.cookies import SimpleCookie
 from http.server import HTTPServer, BaseHTTPRequestHandler
-from urllib.parse import urlparse
+from urllib.parse import urlparse, parse_qs
 
 import pytest
 
@@ -18,14 +21,17 @@ def inner(func):
             return func
         return inner
 
-    def do_GET(self):
+    def do_generic(self):
         parse_result = urlparse(self.path)
-        func = self.handlers['GET'].get(parse_result.path)
+        func = self.handlers[self.command].get(parse_result.path)
         if func is None:
             return self.send_error(HTTPStatus.NOT_FOUND)
 
         return func(self)
 
+    do_GET = do_generic
+    do_POST = do_generic
+
 
 @TestHandler.handler('GET', '/headers')
 def get_headers(handler):
@@ -73,15 +79,80 @@ def random_encoding(handler):
     handler.wfile.write('0\r\n\r\n'.encode('utf-8'))
 
 
+@TestHandler.handler('POST', '/status/msg')
+def status_custom_msg(handler):
+    content_len = int(handler.headers.get('content-length', 0))
+    post_body = handler.rfile.read(content_len).decode()
+
+    handler.send_response(200, post_body)
+    handler.end_headers()
+
+
+@TestHandler.handler('GET', '/cookies')
+def get_cookies(handler):
+    cookies = {
+        'cookies': {
+            key: cookie.value
+            for key, cookie in SimpleCookie(handler.headers.get('Cookie')).items()
+        }
+    }
+    payload = json.dumps(cookies)
+
+    handler.send_response(200)
+    handler.send_header('Content-Length', len(payload))
+    handler.send_header('Content-Type', 'application/json')
+    handler.end_headers()
+    handler.wfile.write(payload.encode('utf-8'))
+
+
+@TestHandler.handler('GET', '/cookies/set')
+def set_cookies(handler):
+    options = parse_qs(urlparse(handler.path).query)
+
+    handler.send_response(200)
+    for cookie, [value] in options.items():
+        handler.send_header('Set-Cookie', f'{cookie}={value}')
+
+    handler.end_headers()
+
+
+@TestHandler.handler('GET', '/cookies/set-and-redirect')
+def set_cookie_and_redirect(handler):
+    handler.send_response(302)
+
+    redirect_to = handler.headers.get('X-Redirect-To', '/headers')
+    handler.send_header('Location', redirect_to)
+
+    raw_cookies = handler.headers.get('X-Cookies', 'a=b')
+    for cookie in raw_cookies.split(', '):
+        handler.send_header('Set-Cookie', cookie)
+    handler.end_headers()
+
+
+@contextmanager
+def _http_server():
+    server = HTTPServer(('localhost', 0), TestHandler)
+    thread = threading.Thread(target=server.serve_forever)
+    thread.start()
+    yield server
+    server.shutdown()
+    thread.join()
+
+
 @pytest.fixture(scope="function")
 def http_server():
     """A custom HTTP server implementation for our tests, that is
     built on top of the http.server module. Handy when we need to
     deal with details which httpbin can not capture."""
 
-    server = HTTPServer(('localhost', 0), TestHandler)
-    thread = threading.Thread(target=server.serve_forever)
-    thread.start()
-    yield '{}:{}'.format(*server.socket.getsockname())
-    server.shutdown()
-    thread.join(timeout=0.5)
+    with _http_server() as server:
+        yield '{0}:{1}'.format(*server.socket.getsockname())
+
+
+@pytest.fixture(scope="function")
+def localhost_http_server():
+    """Just like the http_server, but uses the static
+    `localhost` name for the host."""
+
+    with _http_server() as server:
+        yield 'localhost:{1}'.format(*server.socket.getsockname())
diff --git a/tests/utils/plugins_cli.py b/tests/utils/plugins_cli.py
index a750e664b1..95b6157955 100644
--- a/tests/utils/plugins_cli.py
+++ b/tests/utils/plugins_cli.py
@@ -169,7 +169,7 @@ def interface(tmp_path):
 
     return Interface(
         path=tmp_path / 'interface',
-        environment=MockEnvironment(stdout_mode='t')
+        environment=MockEnvironment()
     )
 
 
@@ -208,12 +208,17 @@ def httpie_plugins(interface):
     from tests.utils import httpie
     from httpie.plugins.registry import plugin_manager
 
-    def runner(*args):
+    def runner(*args, cli_mode: bool = True):
+        args = list(args)
+        if cli_mode:
+            args.insert(0, 'cli')
+        args.insert(cli_mode, 'plugins')
+
         # Prevent installed plugins from showing up.
         original_plugins = plugin_manager.copy()
         clean_sys_path = set(sys.path).difference(site.getsitepackages())
         with patch('sys.path', list(clean_sys_path)):
-            response = httpie('plugins', *args, env=interface.environment)
+            response = httpie(*args, env=interface.environment)
         plugin_manager.clear()
         plugin_manager.extend(original_plugins)
         return response
@@ -223,8 +228,8 @@ def runner(*args):
 
 @pytest.fixture
 def httpie_plugins_success(httpie_plugins):
-    def runner(*args):
-        response = httpie_plugins(*args)
+    def runner(*args, cli_mode: bool = True):
+        response = httpie_plugins(*args, cli_mode=True)
         assert response.exit_status == ExitStatus.SUCCESS
         return response.splitlines()
     return runner