diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,18 @@
 # Changelog for elm-syntax
 
+## 0.3.3.0
+
+- Add support for GHC up to 9.6
+
 ## 0.3.2.0
 
-- The `Monad` instance for `Expression` has been redefined, leading to considerably faster performance. (see [#4](https://github.com/folq/elm-syntax/pull/4))
+- The `Monad` instance for `Expression` has been redefined, leading to considerably faster performance. (see [#4](https://github.com/haskell-to-elm/elm-syntax/pull/4))
 
 ## 0.3.1.0
 
 - Simplify record projections on known records
 - Write explicit export lists
-- Fix build with GHC 9.0. (see [#2](https://github.com/folq/elm-syntax/pull/2))
+- Fix build with GHC 9.0. (see [#2](https://github.com/haskell-to-elm/elm-syntax/pull/2))
 
 ## 0.3.0.0
 
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# elm-syntax [![Build Status](https://travis-ci.com/folq/elm-syntax.svg?branch=master)](https://travis-ci.com/folq/elm-syntax) [![Hackage](https://img.shields.io/hackage/v/elm-syntax.svg)](https://hackage.haskell.org/package/elm-syntax)
+# elm-syntax [![Hackage](https://img.shields.io/hackage/v/elm-syntax.svg)](https://hackage.haskell.org/package/elm-syntax)
 
 A library for generating Elm syntax from Haskell in a scope-safe way.
 
diff --git a/elm-syntax.cabal b/elm-syntax.cabal
--- a/elm-syntax.cabal
+++ b/elm-syntax.cabal
@@ -1,24 +1,25 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.31.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 7a5a97356a0303c135c29af83618eccb2a2d5844234020ab4cd4f38ee561609d
+-- hash: a3e365d3cf561f985813175da49dc02d42f3493a20c53389969c4b15f3e4f5c4
 
 name:           elm-syntax
-version:        0.3.2.0
+version:        0.3.3.0
 synopsis:       Elm syntax and pretty-printing
-description:    Please see the README on GitHub at <https://github.com/folq/elm-syntax#readme>
+description:    Please see the README on GitHub at <https://github.com/haskell-to-elm/elm-syntax#readme>
 category:       Elm, Compiler, Language
-homepage:       https://github.com/folq/elm-syntax#readme
-bug-reports:    https://github.com/folq/elm-syntax/issues
+homepage:       https://github.com/haskell-to-elm/elm-syntax#readme
+bug-reports:    https://github.com/haskell-to-elm/elm-syntax/issues
 author:         Olle Fredriksson
 maintainer:     fredriksson.olle@gmail.com
 copyright:      2019 Olle Fredriksson
 license:        BSD3
 license-file:   LICENSE
-tested-with:    GHC == 8.4.3, GHC == 8.6.5, GHC == 8.8.3
+tested-with:
+    GHC == 8.4.3, GHC == 8.6.5, GHC == 8.8.3, GHC == 9.2.5
 build-type:     Simple
 extra-source-files:
     README.md
@@ -26,7 +27,7 @@
 
 source-repository head
   type: git
-  location: https://github.com/folq/elm-syntax
+  location: https://github.com/haskell-to-elm/elm-syntax
 
 library
   exposed-modules:
@@ -47,7 +48,7 @@
     , bound >=2.0.0
     , deriving-compat >=0.5.0
     , hashable >=1.2.5
-    , prettyprinter >=1.2.1
+    , prettyprinter >=1.6.0
     , text >=1.2.0
     , unordered-containers >=0.2.8
   default-language: Haskell2010
@@ -66,7 +67,7 @@
     , deriving-compat >=0.5.0
     , elm-syntax
     , hashable >=1.2.5
-    , prettyprinter >=1.2.1
+    , prettyprinter >=1.6.0
     , text >=1.2.0
     , unordered-containers >=0.2.8
   default-language: Haskell2010
diff --git a/src/Language/Elm/Expression.hs b/src/Language/Elm/Expression.hs
--- a/src/Language/Elm/Expression.hs
+++ b/src/Language/Elm/Expression.hs
@@ -132,11 +132,12 @@
       fromScope
 
 deriveEq1 ''Expression
-deriveOrd1 ''Expression
-deriveShow1 ''Expression
-
 deriving instance Eq v => Eq (Expression v)
+
+deriveOrd1 ''Expression
 deriving instance Ord v => Ord (Expression v)
+
+deriveShow1 ''Expression
 deriving instance Show v => Show (Expression v)
 
 instance IsString (Expression v) where
diff --git a/src/Language/Elm/Pretty.hs b/src/Language/Elm/Pretty.hs
--- a/src/Language/Elm/Pretty.hs
+++ b/src/Language/Elm/Pretty.hs
@@ -36,7 +36,7 @@
 import Data.List (sort, intersperse)
 import Data.Maybe (isNothing)
 import Data.String
-import Data.Text.Prettyprint.Doc
+import Prettyprinter
 import Data.Void
 
 import Language.Elm.Definition (Definition)
@@ -305,9 +305,6 @@
 
     Name.Qualified ["Parser"] "|." ->
       leftAssoc 6
-
-    "Basics.++" ->
-      rightAssoc 5
 
     "Basics.++" ->
       rightAssoc 5