diff --git a/app/internal/d3d11/backend_windows.go b/app/internal/d3d11/backend_windows.go
index 48ff1752..4ecb44ad 100644
--- a/app/internal/d3d11/backend_windows.go
+++ b/app/internal/d3d11/backend_windows.go
@@ -9,9 +9,10 @@ import (
 	"math"
 	"unsafe"
 
+	"golang.org/x/sys/windows"
+
 	"gioui.org/gpu/backend"
 	gunsafe "gioui.org/internal/unsafe"
-	"golang.org/x/sys/windows"
 )
 
 const debug = false
diff --git a/app/internal/window/os_wayland.go b/app/internal/window/os_wayland.go
index 1924d238..535cf0cf 100644
--- a/app/internal/window/os_wayland.go
+++ b/app/internal/window/os_wayland.go
@@ -19,6 +19,8 @@ import (
 	"time"
 	"unsafe"
 
+	syscall "golang.org/x/sys/unix"
+
 	"gioui.org/app/internal/xkb"
 	"gioui.org/f32"
 	"gioui.org/internal/fling"
@@ -27,7 +29,6 @@ import (
 	"gioui.org/io/pointer"
 	"gioui.org/io/system"
 	"gioui.org/unit"
-	syscall "golang.org/x/sys/unix"
 )
 
 // Use wayland-scanner to generate glue code for the xdg-shell and xdg-decoration extensions.
diff --git a/app/internal/window/os_x11.go b/app/internal/window/os_x11.go
index e75313e6..ab44ca8d 100644
--- a/app/internal/window/os_x11.go
+++ b/app/internal/window/os_x11.go
@@ -42,8 +42,9 @@ import (
 	"gioui.org/io/system"
 	"gioui.org/unit"
 
-	"gioui.org/app/internal/xkb"
 	syscall "golang.org/x/sys/unix"
+
+	"gioui.org/app/internal/xkb"
 )
 
 type x11Window struct {
diff --git a/font/gofont/gofont.go b/font/gofont/gofont.go
index 32f4b0eb..94794398 100644
--- a/font/gofont/gofont.go
+++ b/font/gofont/gofont.go
@@ -11,8 +11,6 @@ import (
 	"fmt"
 	"sync"
 
-	"gioui.org/font/opentype"
-	"gioui.org/text"
 	"golang.org/x/image/font/gofont/gobold"
 	"golang.org/x/image/font/gofont/gobolditalic"
 	"golang.org/x/image/font/gofont/goitalic"
@@ -25,6 +23,9 @@ import (
 	"golang.org/x/image/font/gofont/goregular"
 	"golang.org/x/image/font/gofont/gosmallcaps"
 	"golang.org/x/image/font/gofont/gosmallcapsitalic"
+
+	"gioui.org/font/opentype"
+	"gioui.org/text"
 )
 
 var (
diff --git a/font/opentype/opentype.go b/font/opentype/opentype.go
index 17732d2a..8f522be1 100644
--- a/font/opentype/opentype.go
+++ b/font/opentype/opentype.go
@@ -10,13 +10,14 @@ import (
 	"unicode"
 	"unicode/utf8"
 
+	"golang.org/x/image/font"
+	"golang.org/x/image/font/sfnt"
+	"golang.org/x/image/math/fixed"
+
 	"gioui.org/f32"
 	"gioui.org/op"
 	"gioui.org/op/clip"
 	"gioui.org/text"
-	"golang.org/x/image/font"
-	"golang.org/x/image/font/sfnt"
-	"golang.org/x/image/math/fixed"
 )
 
 // Font implements text.Face. Its methods are safe to use
diff --git a/font/opentype/opentype_test.go b/font/opentype/opentype_test.go
index bd8da79f..fd3091de 100644
--- a/font/opentype/opentype_test.go
+++ b/font/opentype/opentype_test.go
@@ -10,13 +10,14 @@ import (
 	"strings"
 	"testing"
 
-	"gioui.org/internal/ops"
-	"gioui.org/op"
-	"gioui.org/text"
 	"golang.org/x/image/font"
 	"golang.org/x/image/font/gofont/goregular"
 	"golang.org/x/image/font/sfnt"
 	"golang.org/x/image/math/fixed"
+
+	"gioui.org/internal/ops"
+	"gioui.org/op"
+	"gioui.org/text"
 )
 
 func TestCollectionAsFace(t *testing.T) {
diff --git a/internal/d3dcompile/compile_windows.go b/internal/d3dcompile/compile_windows.go
index 4766be7c..1555acc5 100644
--- a/internal/d3dcompile/compile_windows.go
+++ b/internal/d3dcompile/compile_windows.go
@@ -4,9 +4,8 @@ package d3dcompile
 
 import (
 	"fmt"
-	"unsafe"
-
 	"syscall"
+	"unsafe"
 
 	gunsafe "gioui.org/internal/unsafe"
 
diff --git a/internal/rendertest/clip_test.go b/internal/rendertest/clip_test.go
index a92cda84..29cb8a33 100644
--- a/internal/rendertest/clip_test.go
+++ b/internal/rendertest/clip_test.go
@@ -5,11 +5,12 @@ import (
 	"math"
 	"testing"
 
+	"golang.org/x/image/colornames"
+
 	"gioui.org/f32"
 	"gioui.org/op"
 	"gioui.org/op/clip"
 	"gioui.org/op/paint"
-	"golang.org/x/image/colornames"
 )
 
 func TestPaintRect(t *testing.T) {
diff --git a/internal/rendertest/render_test.go b/internal/rendertest/render_test.go
index eecac8fa..58a8bd2a 100644
--- a/internal/rendertest/render_test.go
+++ b/internal/rendertest/render_test.go
@@ -6,12 +6,13 @@ import (
 	"math"
 	"testing"
 
+	"golang.org/x/image/colornames"
+
 	"gioui.org/f32"
 	"gioui.org/internal/f32color"
 	"gioui.org/op"
 	"gioui.org/op/clip"
 	"gioui.org/op/paint"
-	"golang.org/x/image/colornames"
 )
 
 func TestTransformMacro(t *testing.T) {
diff --git a/internal/rendertest/transform_test.go b/internal/rendertest/transform_test.go
index 27e49918..86c54548 100644
--- a/internal/rendertest/transform_test.go
+++ b/internal/rendertest/transform_test.go
@@ -5,11 +5,12 @@ import (
 	"math"
 	"testing"
 
+	"golang.org/x/image/colornames"
+
 	"gioui.org/f32"
 	"gioui.org/op"
 	"gioui.org/op/clip"
 	"gioui.org/op/paint"
-	"golang.org/x/image/colornames"
 )
 
 func TestPaintOffset(t *testing.T) {
diff --git a/internal/rendertest/util_test.go b/internal/rendertest/util_test.go
index 6568aceb..591dd0ab 100644
--- a/internal/rendertest/util_test.go
+++ b/internal/rendertest/util_test.go
@@ -13,12 +13,13 @@ import (
 	"strconv"
 	"testing"
 
+	"golang.org/x/image/colornames"
+
 	"gioui.org/app/headless"
 	"gioui.org/f32"
 	"gioui.org/internal/f32color"
 	"gioui.org/op"
 	"gioui.org/op/paint"
-	"golang.org/x/image/colornames"
 )
 
 var (
diff --git a/text/lru.go b/text/lru.go
index 85dbf9c3..ada028ab 100644
--- a/text/lru.go
+++ b/text/lru.go
@@ -3,8 +3,9 @@
 package text
 
 import (
-	"gioui.org/op"
 	"golang.org/x/image/math/fixed"
+
+	"gioui.org/op"
 )
 
 type layoutCache struct {
diff --git a/text/shaper.go b/text/shaper.go
index 71d7301d..fee7ab1c 100644
--- a/text/shaper.go
+++ b/text/shaper.go
@@ -6,8 +6,9 @@ import (
 	"io"
 	"strings"
 
-	"gioui.org/op"
 	"golang.org/x/image/math/fixed"
+
+	"gioui.org/op"
 )
 
 // Shaper implements layout and shaping of text.
diff --git a/text/text.go b/text/text.go
index ed8695fc..aa14bdfd 100644
--- a/text/text.go
+++ b/text/text.go
@@ -5,8 +5,9 @@ package text
 import (
 	"io"
 
-	"gioui.org/op"
 	"golang.org/x/image/math/fixed"
+
+	"gioui.org/op"
 )
 
 // A Line contains the measurements of a line of text.
diff --git a/widget/icon.go b/widget/icon.go
index 846c6222..f6f88d3e 100644
--- a/widget/icon.go
+++ b/widget/icon.go
@@ -7,11 +7,12 @@ import (
 	"image/color"
 	"image/draw"
 
+	"golang.org/x/exp/shiny/iconvg"
+
 	"gioui.org/internal/f32color"
 	"gioui.org/layout"
 	"gioui.org/op/paint"
 	"gioui.org/unit"
-	"golang.org/x/exp/shiny/iconvg"
 )
 
 type Icon struct {
diff --git a/widget/material/theme.go b/widget/material/theme.go
index 8cc44c7c..5b3e6278 100644
--- a/widget/material/theme.go
+++ b/widget/material/theme.go
@@ -5,10 +5,11 @@ package material
 import (
 	"image/color"
 
+	"golang.org/x/exp/shiny/materialdesign/icons"
+
 	"gioui.org/text"
 	"gioui.org/unit"
 	"gioui.org/widget"
-	"golang.org/x/exp/shiny/materialdesign/icons"
 )
 
 // Palette contains the minimal set of colors that a widget may need to