diff --git a/README.rst b/README.rst
index 87c4887a39ef0b7c23656ccf403daea26fdee8b3..fb815ef3967040d5988a41d82f6f54ef85677d5a 100644
--- a/README.rst
+++ b/README.rst
@@ -4,10 +4,10 @@ Loopy: Transformation-Based Generation of High-Performance CPU/GPU Code
 .. image:: https://gitlab.tiker.net/inducer/loopy/badges/main/pipeline.svg
     :alt: Gitlab Build Status
     :target: https://gitlab.tiker.net/inducer/loopy/commits/main
-.. image:: https://github.com/inducer/loopy/workflows/CI/badge.svg?branch=main
+.. image:: https://github.com/inducer/loopy/actions/workflows/ci.yml/badge.svg
     :alt: Github Build Status
-    :target: https://github.com/inducer/loopy/actions?query=branch%3Amain+workflow%3ACI
-.. image:: https://badge.fury.io/py/loopy.png
+    :target: https://github.com/inducer/loopy/actions/workflows/ci.yml
+.. image:: https://badge.fury.io/py/loopy.svg
     :alt: Python Package Index Release Page
     :target: https://pypi.org/project/loopy/
 .. image:: https://zenodo.org/badge/20281732.svg
@@ -28,7 +28,7 @@ It can capture the following types of optimizations:
 * Loop tiling with efficient handling of boundary cases
 * Prefetching/copy optimizations
 * Instruction level parallelism
-* and many more
+* and many more!
 
 Loopy targets array-type computations, such as the following:
 
@@ -36,26 +36,26 @@ Loopy targets array-type computations, such as the following:
 * convolutions,
 * n-body interactions,
 * PDE solvers, such as finite element, finite difference, and
-  Fast-Multipole-type computations
+  Fast-Multipole-type computations.
 
 It is not (and does not want to be) a general-purpose programming language.
 
 Loopy is licensed under the liberal `MIT license
-<https://en.wikipedia.org/wiki/MIT_License>`_ and free for commercial, academic,
+<https://en.wikipedia.org/wiki/MIT_License>`__ and free for commercial, academic,
 and private use. All of Loopy's dependencies can be automatically installed from
 the package index after using::
 
     pip install loopy
 
 In addition, Loopy is compatible with and enhances
-`pyopencl <https://mathema.tician.de/software/pyopencl>`_.
+`pyopencl <https://mathema.tician.de/software/pyopencl>`__.
 
 ---
 
 Places on the web related to Loopy:
 
-* `Python package index <https://pypi.org/project/loopy>`_ (download releases)
-* `Documentation <https://documen.tician.de/loopy>`_ (read how things work)
-* `Github <https://github.com/inducer/loopy>`_ (get latest source code, file bugs)
-* `Homepage <https://mathema.tician.de/software/loopy>`_
-* `Benchmarks <https://documen.tician.de/loopy/benchmarks>`_
+* `Python Package Index <https://pypi.org/project/loopy>`__ (download releases)
+* `Documentation <https://documen.tician.de/loopy>`__ (read how things work)
+* `Github <https://github.com/inducer/loopy>`__ (get latest source code, file bugs)
+* `Homepage <https://mathema.tician.de/software/loopy>`__
+* `Benchmarks <https://documen.tician.de/loopy/benchmarks>`__