From 38886de0c3e9ea5729ef23e4c653fa2822f52e8f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 6 Apr 2021 14:43:39 +0200
Subject: xscreensaver 6.00

---
 hacks/config/README               | 11 +++--
 hacks/config/antinspect.xml       |  2 +-
 hacks/config/antmaze.xml          |  2 +-
 hacks/config/antspotlight.xml     |  2 +-
 hacks/config/apple2.xml           |  2 +-
 hacks/config/beats.xml            | 42 +++++++++++++++++
 hacks/config/binaryring.xml       |  2 +-
 hacks/config/blinkbox.xml         |  2 +-
 hacks/config/blitspin.xml         |  2 +-
 hacks/config/blocktube.xml        |  2 +-
 hacks/config/bouncingcow.xml      |  2 +-
 hacks/config/boxfit.xml           |  2 +-
 hacks/config/bsod.xml             | 33 +++++++------
 hacks/config/bubble3d.xml         |  2 +-
 hacks/config/cage.xml             |  4 +-
 hacks/config/ccurve.xml           |  2 +-
 hacks/config/cityflow.xml         |  2 +-
 hacks/config/cloudlife.xml        |  2 +-
 hacks/config/co____9.xml          | 38 +++++++++++++++
 hacks/config/companioncube.xml    |  2 +-
 hacks/config/covid19.xml          | 38 +++++++++++++++
 hacks/config/cube21.xml           |  2 +-
 hacks/config/cubestack.xml        |  2 +-
 hacks/config/cubestorm.xml        |  2 +-
 hacks/config/cubetwist.xml        |  2 +-
 hacks/config/cubicgrid.xml        |  8 +++-
 hacks/config/cwaves.xml           |  2 +-
 hacks/config/dangerball.xml       |  2 +-
 hacks/config/decayscreen.xml      |  2 +-
 hacks/config/deepstars.xml        |  2 +-
 hacks/config/dymaxionmap.xml      |  2 +-
 hacks/config/energystream.xml     |  2 +-
 hacks/config/epicycle.xml         | 11 +++++
 hacks/config/etruscanvenus.xml    |  4 +-
 hacks/config/euler2d.xml          |  2 +-
 hacks/config/fadeplot.xml         |  2 +-
 hacks/config/fiberlamp.xml        |  2 +-
 hacks/config/filmleader.xml       |  2 +-
 hacks/config/flipflop.xml         |  2 +-
 hacks/config/flipscreen3d.xml     |  2 +-
 hacks/config/fliptext.xml         |  2 +-
 hacks/config/fluidballs.xml       |  2 +-
 hacks/config/flyingtoasters.xml   |  2 +-
 hacks/config/fontglide.xml        |  2 +-
 hacks/config/fuzzyflakes.xml      |  2 +-
 hacks/config/gears.xml            |  4 +-
 hacks/config/geodesicgears.xml    |  2 +-
 hacks/config/glblur.xml           |  2 +-
 hacks/config/glcells.xml          |  2 +-
 hacks/config/glforestfire.xml     |  2 +-
 hacks/config/glhanoi.xml          |  2 +-
 hacks/config/glknots.xml          |  2 +-
 hacks/config/glmatrix.xml         |  2 +-
 hacks/config/glplanet.xml         |  2 +-
 hacks/config/glschool.xml         |  2 +-
 hacks/config/glslideshow.xml      |  2 +-
 hacks/config/glsnake.xml          |  2 +-
 hacks/config/gltext.xml           |  2 +-
 hacks/config/gravitywell.xml      |  2 +-
 hacks/config/headroom.xml         | 48 +++++++++++++++++++
 hacks/config/hexstrut.xml         |  2 +-
 hacks/config/hyperball.xml        |  2 +-
 hacks/config/hypercube.xml        |  2 +-
 hacks/config/hypnowheel.xml       |  2 +-
 hacks/config/imsmap.xml           |  2 +-
 hacks/config/jigglypuff.xml       |  2 +-
 hacks/config/juggler3d.xml        |  2 +-
 hacks/config/klein.xml            |  6 +--
 hacks/config/lcdscrub.xml         |  2 +-
 hacks/config/maze3d.xml           |  2 +-
 hacks/config/memscroller.xml      |  2 +-
 hacks/config/menger.xml           |  2 +-
 hacks/config/metaballs.xml        |  8 ++--
 hacks/config/mirrorblob.xml       |  2 +-
 hacks/config/moebius.xml          |  8 ++--
 hacks/config/moebiusgears.xml     |  6 +--
 hacks/config/moire.xml            |  6 +--
 hacks/config/moire2.xml           |  4 +-
 hacks/config/morph3d.xml          |  2 +-
 hacks/config/nerverot.xml         |  2 +-
 hacks/config/noseguy.xml          |  2 +-
 hacks/config/pacman.xml           |  2 +-
 hacks/config/photopile.xml        |  2 +-
 hacks/config/pinion.xml           |  4 +-
 hacks/config/popsquares.xml       |  2 +-
 hacks/config/projectiveplane.xml  |  4 +-
 hacks/config/quasicrystal.xml     |  2 +-
 hacks/config/raverhoop.xml        |  2 +-
 hacks/config/razzledazzle.xml     |  2 +-
 hacks/config/rd-bomb.xml          |  2 +-
 hacks/config/romanboy.xml         |  4 +-
 hacks/config/rotzoomer.xml        |  2 +-
 hacks/config/rubikblocks.xml      |  2 +-
 hacks/config/shadebobs.xml        |  2 +-
 hacks/config/sierpinski3d.xml     |  2 +-
 hacks/config/skytentacles.xml     |  2 +-
 hacks/config/slidescreen.xml      |  2 +-
 hacks/config/speedmine.xml        |  2 +-
 hacks/config/sphereeversion.xml   | 98 +++++++++++++++++++++++++++++++++++++++
 hacks/config/spheremonics.xml     |  2 +-
 hacks/config/spiral.xml           |  4 +-
 hacks/config/splitflap.xml        |  2 +-
 hacks/config/starwars.xml         |  2 +-
 hacks/config/stonerview.xml       |  2 +-
 hacks/config/surfaces.xml         |  4 +-
 hacks/config/testx11.xml          |  2 +-
 hacks/config/timetunnel.xml       |  2 +-
 hacks/config/topblock.xml         |  2 +-
 hacks/config/tronbit.xml          |  2 +-
 hacks/config/unknownpleasures.xml |  2 +-
 hacks/config/vidwhacker.xml       |  2 +-
 hacks/config/webcollage.xml       |  2 +-
 hacks/config/whirlwindwarp.xml    |  2 +-
 hacks/config/winduprobot.xml      |  2 +-
 114 files changed, 434 insertions(+), 145 deletions(-)
 create mode 100644 hacks/config/beats.xml
 create mode 100644 hacks/config/co____9.xml
 create mode 100644 hacks/config/covid19.xml
 create mode 100644 hacks/config/headroom.xml
 create mode 100644 hacks/config/sphereeversion.xml

(limited to 'hacks/config')

diff --git a/hacks/config/README b/hacks/config/README
index 5ba2e7b..b031323 100644
--- a/hacks/config/README
+++ b/hacks/config/README
@@ -4,8 +4,8 @@
             a screen saver and locker for the X window system
                             by Jamie Zawinski
 
-                              version 5.44
-                               20-Mar-2020
+                              version 6.00
+                               01-Apr-2021
 
                      https://www.jwz.org/xscreensaver/
 
@@ -13,8 +13,7 @@
 
 This directory contains XML files that describe each of the screenhacks;
 the per-hack user interface is constructed based on the things in these
-files.  The files are loaded at run-time by xscreensaver-demo (also
-known as "the Control Center screensaver properties capplet".)
+files.  The files are loaded at run-time by "xscreensaver-settings".
 
 The tags and parameters used here are:
 
@@ -76,6 +75,7 @@ The tags and parameters used here are:
           _high-label="RIGHT LABEL"
           low="MIN VALUE"
           high="MAX VALUE"
+          step="MODULUS"
           default="DEFAULT VALUE"
           [ convert="invert" ]
           />
@@ -256,6 +256,9 @@ The tags and parameters used here are:
 
 -----------------------------------------------------------------------
 
+Those tags and parameters whose names begin with an underscore contain
+strings that are translatable via the ../../po/ directory.
+
 If you are DTD-minded, you may also find the included files "xss.dtd"
 and "xss.xsd" useful.
 
diff --git a/hacks/config/antinspect.xml b/hacks/config/antinspect.xml
index ee4ce7b..9878e6b 100644
--- a/hacks/config/antinspect.xml
+++ b/hacks/config/antinspect.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="antinspect" _label="AntInspect" gl="yes">
+<screensaver name="antinspect" _label="Ant Inspect" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/antmaze.xml b/hacks/config/antmaze.xml
index 1580205..3344c24 100644
--- a/hacks/config/antmaze.xml
+++ b/hacks/config/antmaze.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="antmaze" _label="AntMaze" gl="yes">
+<screensaver name="antmaze" _label="Ant Maze" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/antspotlight.xml b/hacks/config/antspotlight.xml
index fe78174..3df385c 100644
--- a/hacks/config/antspotlight.xml
+++ b/hacks/config/antspotlight.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="antspotlight" _label="AntSpotlight" gl="yes">
+<screensaver name="antspotlight" _label="Ant Spotlight" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/apple2.xml b/hacks/config/apple2.xml
index 4084bc9..dcfa241 100644
--- a/hacks/config/apple2.xml
+++ b/hacks/config/apple2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="apple2" _label="Apple2">
+<screensaver name="apple2" _label="Apple ][">
 
  <command arg="-root"/>
 
diff --git a/hacks/config/beats.xml b/hacks/config/beats.xml
new file mode 100644
index 0000000..581ebf9
--- /dev/null
+++ b/hacks/config/beats.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<screensaver name="beats" _label="Beats" gl="yes">
+
+  <command arg="-root"/>
+
+  <video href="https://www.youtube.com/watch?v=u7N5l0LXryg"/>
+
+  <number id="delay" type="slider" arg="-delay %"
+          _label="Frame rate" _low-label="Low" _high-label="High"
+          low="0" high="100000" default="30000"
+          convert="invert"/>
+
+  <number id="count" type="slider" arg="-count %"
+          _label="Number of balls" _low-label="Few" _high-label="Many"
+          low="1" high="100" default="30"/>
+
+  <select id="cycle">
+   <option id="random" _label="Random cycle style"/>
+   <option _label="Clockwise cycle"  arg-set="-cycle 0"/>
+   <option _label="Rain dance cycle" arg-set="-cycle 1"/>
+   <option _label="Metronome cycle"  arg-set="-cycle 2"/>
+   <option _label="Galaxy cycle"     arg-set="-cycle 3"/>
+  </select>
+
+  <hgroup>
+   <boolean id="tick"    _label="Tick"         arg-unset="-no-tick"/>
+   <boolean id="blur"    _label="Motion Blur"  arg-unset="-no-blur"/>
+   <boolean id="wire"    _label="Wireframe"    arg-set="-wireframe"/>
+  </hgroup>
+
+  <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+
+  <xscreensaver-updater />
+
+  <_description>
+Draws figures that move around at a slightly different rate from
+each other, creating interesting chaotic and ordered patterns.
+
+Written by David Eccles; 2020.
+  </_description>
+</screensaver>
diff --git a/hacks/config/binaryring.xml b/hacks/config/binaryring.xml
index a96026c..479d40e 100644
--- a/hacks/config/binaryring.xml
+++ b/hacks/config/binaryring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="binaryring" _label="BinaryRing">
+<screensaver name="binaryring" _label="Binary Ring">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/blinkbox.xml b/hacks/config/blinkbox.xml
index d457df2..0f84baf 100644
--- a/hacks/config/blinkbox.xml
+++ b/hacks/config/blinkbox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="blinkbox" _label="BlinkBox" gl="yes">
+<screensaver name="blinkbox" _label="Blink Box" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/blitspin.xml b/hacks/config/blitspin.xml
index df53aa7..34b182f 100644
--- a/hacks/config/blitspin.xml
+++ b/hacks/config/blitspin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="blitspin" _label="BlitSpin">
+<screensaver name="blitspin" _label="Blit Spin">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/blocktube.xml b/hacks/config/blocktube.xml
index 85f88f9..87d91c1 100644
--- a/hacks/config/blocktube.xml
+++ b/hacks/config/blocktube.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="blocktube" _label="BlockTube" gl="yes">
+<screensaver name="blocktube" _label="Block Tube" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/bouncingcow.xml b/hacks/config/bouncingcow.xml
index abbb0cb..48a1aed 100644
--- a/hacks/config/bouncingcow.xml
+++ b/hacks/config/bouncingcow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="bouncingcow" _label="BouncingCow" gl="yes">
+<screensaver name="bouncingcow" _label="Bouncing Cow" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/boxfit.xml b/hacks/config/boxfit.xml
index a297e13..b978a5d 100644
--- a/hacks/config/boxfit.xml
+++ b/hacks/config/boxfit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="boxfit" _label="BoxFit">
+<screensaver name="boxfit" _label="Box Fit">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/bsod.xml b/hacks/config/bsod.xml
index 6a3ac4a..aa3dca1 100644
--- a/hacks/config/bsod.xml
+++ b/hacks/config/bsod.xml
@@ -10,7 +10,7 @@
   <number id="delay" type="slider" arg="-delay %"
           _label="Duration" _low-label="5 seconds" _high-label="2 minutes"
           low="5" high="120" default="45"/>
-  <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+<!--  <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/> -->
  </hgroup>
 
  <hgroup>
@@ -19,49 +19,54 @@
    <boolean id="nt"         _label="Windows NT"     arg-unset="-no-nt"/>
    <boolean id="2k"         _label="Windows 2000  " arg-unset="-no-2k"/>
    <boolean id="win10"      _label="Windows 10    " arg-unset="-no-win10"/>
-   <boolean id="msdos"      _label="MS-DOS"         arg-unset="-no-msdos"/>
   </vgroup>
   <vgroup>
-   <boolean id="amiga"      _label="AmigaDOS"       arg-unset="-no-amiga"/>
+   <boolean id="msdos"      _label="MS-DOS"         arg-unset="-no-msdos"/>
    <boolean id="glados"     _label="GLaDOS"         arg-unset="-no-glados"/>
+   <boolean id="amiga"      _label="AmigaDOS"       arg-unset="-no-amiga"/>
    <boolean id="android"    _label="Android"        arg-set="-android"/>
-   <boolean id="apple2"     _label="Apple ]["       arg-unset="-no-apple2"/>
-   <boolean id="ransomware" _label="Ransomware"     arg-unset="-no-ransomware"/>
   </vgroup>
   <vgroup>
+   <boolean id="apple2"     _label="Apple ]["       arg-unset="-no-apple2"/>
+   <boolean id="ransomware" _label="Ransomware"     arg-unset="-no-ransomware"/>
    <boolean id="nvidia"     _label="NVidia"         arg-unset="-no-nvidia"/>
    <boolean id="os2"        _label="OS/2"           arg-unset="-no-os2"/>
+  </vgroup>
+  <vgroup>
    <boolean id="mac"        _label="Sad Mac"        arg-unset="-no-mac"/>
    <boolean id="mac1"       _label="Mac bomb"       arg-unset="-no-mac1"/>
-   <boolean id="vmware"     _label="VMware"         arg-unset="-no-vmware"/>
+   <boolean id="macsbug"    _label="MacsBug"        arg-unset="-no-macsbug"/>
+   <boolean id="macx"       _label="MacOS X"        arg-unset="-no-macx"/>
   </vgroup>
   <vgroup>
-   <boolean id="macsbug"    _label="MacsBug"        arg-unset="-no-macsbug"/>
+   <boolean id="vmware"     _label="VMware"         arg-unset="-no-vmware"/>
    <boolean id="atari"      _label="Atari"          arg-set="-atari"/>
-   <boolean id="macx"       _label="MacOS X"        arg-unset="-no-macx"/>
    <boolean id="os390"      _label="OS/390"         arg-unset="-no-os390"/>
-   <boolean id="encom"      _label="Encom"          arg-unset="-no-encom"/>
+   <boolean id="hvx"        _label="HVX/GCOS"       arg-unset="-no-hvx"/>
   </vgroup>
   <vgroup>
-   <boolean id="hvx"        _label="HVX/GCOS6"      arg-unset="-no-hvx"/>
-   <boolean id="blitdamage" _label="NCD X Terminal  " arg-unset="-no-blitdamage"/>
+   <boolean id="encom"      _label="Encom"          arg-unset="-no-encom"/>
+   <boolean id="blitdamage" _label="NCD XTerm"      arg-unset="-no-blitdamage"/>
    <boolean id="atm"        _label="ATM"            arg-unset="-no-atm"/>
    <boolean id="dvd"        _label="DVD"            arg-unset="-no-dvd"/>
-   <boolean id="nintendo"   _label="Nintendo"       arg-unset="-no-nintendo"/>
   </vgroup>
   <vgroup>
+   <boolean id="nintendo"   _label="Nintendo"       arg-unset="-no-nintendo"/>
    <boolean id="tivo"       _label="Tivo"           arg-unset="-no-tivo"/>
    <boolean id="vms"        _label="VMS"            arg-unset="-no-vms"/>
    <boolean id="bsd"        _label="BSD"            arg-set="-bsd"/>
-   <boolean id="linux"      _label="Linux (fsck)"   arg-unset="-no-linux"/>
-   <boolean id="sparclinux" _label="Linux (sparc)"  arg-set="-sparclinux"/>
   </vgroup>
   <vgroup>
+   <boolean id="linux"      _label="Linux (fsck)"   arg-unset="-no-linux"/>
+   <boolean id="sparclinux" _label="Linux (sparc)"  arg-set="-sparclinux"/>
    <boolean id="hppalinux"  _label="Linux (hppa)"   arg-unset="-no-hppalinux"/>
    <boolean id="solaris"    _label="Solaris"        arg-unset="-no-solaris"/>
+  </vgroup>
+  <vgroup>
    <boolean id="sco"        _label="SCO"            arg-unset="-no-sco"/>
    <boolean id="hpux"       _label="HPUX"           arg-unset="-no-hpux"/>
    <boolean id="tru64"      _label="Tru64"          arg-unset="-no-tru64"/>
+   <boolean id="gnome"      _label="GNOME"          arg-unset="-no-gnome"/>
   </vgroup>
  </hgroup>
 
diff --git a/hacks/config/bubble3d.xml b/hacks/config/bubble3d.xml
index 985c394..bcc0f4b 100644
--- a/hacks/config/bubble3d.xml
+++ b/hacks/config/bubble3d.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="bubble3d" _label="Bubble3D" gl="yes">
+<screensaver name="bubble3d" _label="Bubble 3D" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/cage.xml b/hacks/config/cage.xml
index 6ede618..6fedb3c 100644
--- a/hacks/config/cage.xml
+++ b/hacks/config/cage.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <screensaver name="cage" _label="Cage" gl="yes">
 
@@ -17,7 +17,7 @@
   <xscreensaver-updater />
 
   <_description>
-Escher's "Impossible Cage", a 3d analog of a moebius
+Escher's "Impossible Cage", a 3d analog of a möbius
 strip, and rotates it in three dimensions.
 
 https://en.wikipedia.org/wiki/Maurits_Cornelis_Escher
diff --git a/hacks/config/ccurve.xml b/hacks/config/ccurve.xml
index e15138f..84a6121 100644
--- a/hacks/config/ccurve.xml
+++ b/hacks/config/ccurve.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="ccurve" _label="CCurve">
+<screensaver name="ccurve" _label="C Curve">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/cityflow.xml b/hacks/config/cityflow.xml
index 61f67d9..4a94c35 100644
--- a/hacks/config/cityflow.xml
+++ b/hacks/config/cityflow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="cityflow" _label="Cityflow" gl="yes">
+<screensaver name="cityflow" _label="City Flow" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/cloudlife.xml b/hacks/config/cloudlife.xml
index 767a8ea..92ea6c3 100644
--- a/hacks/config/cloudlife.xml
+++ b/hacks/config/cloudlife.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="cloudlife" _label="CloudLife">
+<screensaver name="cloudlife" _label="Cloud Life">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/co____9.xml b/hacks/config/co____9.xml
new file mode 100644
index 0000000..f1dc4bb
--- /dev/null
+++ b/hacks/config/co____9.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<screensaver name="co____9" _label="Co____9" gl="yes">
+
+  <command arg="-root"/>
+
+  <video href="https://www.youtube.com/watch?v=xJDxZXbO8mY"/>
+
+  <number id="delay" type="slider" arg="-delay %"
+          _label="Frame rate" _low-label="Low" _high-label="High"
+          low="0" high="100000" default="30000"
+          convert="invert"/>
+
+  <number id="speed" type="slider" arg="-speed %"
+          _label="Speed" _low-label="Slow" _high-label="Fast"
+          low="0.1" high="4.0" default="1"/>
+
+  <number id="count" type="slider" arg="-count %"
+          _label="How many pretty pretty balls"
+          _low-label="Not so many" _high-label="A bunch"
+          low="1" high="400" default="60"/>
+
+  <hgroup>
+   <boolean id="wander" _label="Wander"    arg-unset="-no-wander"/>
+   <boolean id="spin"   _label="Spin"      arg-unset="-no-spin"/>
+   <boolean id="wire"   _label="Wireframe" arg-set="-wireframe"/>
+  </hgroup>
+
+  <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+
+  <xscreensaver-updater />
+
+  <_description>
+This is fine.
+
+Written by Jamie Zawinski; 2020.
+  </_description>
+</screensaver>
diff --git a/hacks/config/companioncube.xml b/hacks/config/companioncube.xml
index 128edc5..2a59f3a 100644
--- a/hacks/config/companioncube.xml
+++ b/hacks/config/companioncube.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="companioncube" _label="CompanionCube" gl="yes">
+<screensaver name="companioncube" _label="Companion Cube" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/covid19.xml b/hacks/config/covid19.xml
new file mode 100644
index 0000000..96f395b
--- /dev/null
+++ b/hacks/config/covid19.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<screensaver name="covid19" _label="COVID19" gl="yes">
+
+  <command arg="-root"/>
+
+  <video href="https://www.youtube.com/watch?v=xJDxZXbO8mY"/>
+
+  <number id="delay" type="slider" arg="-delay %"
+          _label="Frame rate" _low-label="Low" _high-label="High"
+          low="0" high="100000" default="30000"
+          convert="invert"/>
+
+  <number id="speed" type="slider" arg="-speed %"
+          _label="Speed" _low-label="Slow" _high-label="Fast"
+          low="0.1" high="4.0" default="1"/>
+
+  <number id="count" type="slider" arg="-count %"
+          _label="Government Response"
+          _low-label="Taiwan" _high-label="United States"
+          low="1" high="400" default="60"/>
+
+  <hgroup>
+   <boolean id="wander" _label="Wander"    arg-unset="-no-wander"/>
+   <boolean id="spin"   _label="Spin"      arg-unset="-no-spin"/>
+   <boolean id="wire"   _label="Wireframe" arg-set="-wireframe"/>
+  </hgroup>
+
+  <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+
+  <xscreensaver-updater />
+
+  <_description>
+SARS-CoV-2. Stay the fuck home. Wear a fucking mask.
+
+Written by Jamie Zawinski; 2020.
+  </_description>
+</screensaver>
diff --git a/hacks/config/cube21.xml b/hacks/config/cube21.xml
index f16d7fd..17082db 100644
--- a/hacks/config/cube21.xml
+++ b/hacks/config/cube21.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="cube21" _label="Cube21" gl="yes">
+<screensaver name="cube21" _label="Cube 21" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/cubestack.xml b/hacks/config/cubestack.xml
index 68c550e..9dcc3aa 100644
--- a/hacks/config/cubestack.xml
+++ b/hacks/config/cubestack.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="cubestack" _label="CubeStack" gl="yes">
+<screensaver name="cubestack" _label="Cube Stack" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/cubestorm.xml b/hacks/config/cubestorm.xml
index 533d710..366bb89 100644
--- a/hacks/config/cubestorm.xml
+++ b/hacks/config/cubestorm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="cubestorm" _label="CubeStorm" gl="yes">
+<screensaver name="cubestorm" _label="Cube Storm" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/cubetwist.xml b/hacks/config/cubetwist.xml
index 00f54b8..ced60ec 100644
--- a/hacks/config/cubetwist.xml
+++ b/hacks/config/cubetwist.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="cubetwist" _label="CubeTwist" gl="yes">
+<screensaver name="cubetwist" _label="Cube Twist" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/cubicgrid.xml b/hacks/config/cubicgrid.xml
index b8a90a8..10bdf80 100644
--- a/hacks/config/cubicgrid.xml
+++ b/hacks/config/cubicgrid.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="cubicgrid" _label="CubicGrid" gl="yes">
+<screensaver name="cubicgrid" _label="Cubic Grid" gl="yes">
 
   <command arg="-root"/>
 
@@ -21,6 +21,12 @@
   <boolean id="bigdots" _label="Big dots"            arg-unset="-no-bigdots"/>
   <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
 
+  <select id="symmetry">
+    <option id="random"    _label="Random symmetry"/>
+    <option id="cubic"     _label="Cubic symmetry" arg-set="-symmetry cubic"/>
+    <option id="hexagonal" _label="Hexagonal symmetry" arg-set="-symmetry hexagonal"/>
+  </select>
+
   <xscreensaver-updater />
 
   <_description>
diff --git a/hacks/config/cwaves.xml b/hacks/config/cwaves.xml
index b18f365..3e77b42 100644
--- a/hacks/config/cwaves.xml
+++ b/hacks/config/cwaves.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="cwaves" _label="CWaves">
+<screensaver name="cwaves" _label="C Waves">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/dangerball.xml b/hacks/config/dangerball.xml
index 12bbac5..51d9fe1 100644
--- a/hacks/config/dangerball.xml
+++ b/hacks/config/dangerball.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="dangerball" _label="DangerBall" gl="yes">
+<screensaver name="dangerball" _label="Danger Ball" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/decayscreen.xml b/hacks/config/decayscreen.xml
index 93d85b3..266d8d6 100644
--- a/hacks/config/decayscreen.xml
+++ b/hacks/config/decayscreen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="decayscreen" _label="DecayScreen">
+<screensaver name="decayscreen" _label="Decay Screen">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/deepstars.xml b/hacks/config/deepstars.xml
index d690d2d..3186376 100644
--- a/hacks/config/deepstars.xml
+++ b/hacks/config/deepstars.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="deepstars" _label="DeepStars" gl="yes">
+<screensaver name="deepstars" _label="Deep Stars" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/dymaxionmap.xml b/hacks/config/dymaxionmap.xml
index 6f846c7..1cc027a 100644
--- a/hacks/config/dymaxionmap.xml
+++ b/hacks/config/dymaxionmap.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="dymaxionmap" _label="DymaxionMap" gl="yes">
+<screensaver name="dymaxionmap" _label="Dymaxion Map" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/energystream.xml b/hacks/config/energystream.xml
index a3c034f..c9f8966 100644
--- a/hacks/config/energystream.xml
+++ b/hacks/config/energystream.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="energystream" _label="EnergyStream" gl="yes">
+<screensaver name="energystream" _label="Energy Stream" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/epicycle.xml b/hacks/config/epicycle.xml
index 0b56922..18b23df 100644
--- a/hacks/config/epicycle.xml
+++ b/hacks/config/epicycle.xml
@@ -50,6 +50,17 @@ This draws the path traced out by a point on the edge of a
 circle.  That circle rotates around a point on the rim of another
 circle, and so on, several times.
 
+The geometry of epicycles was perfected by Hipparchus of Rhodes at some time
+around 125 B.C., 185 years after the birth of Aristarchus of Samos, the
+inventor of the heliocentric universe model.  Hipparchus applied epicycles to
+the Sun and the Moon.  Ptolemy of Alexandria went on to apply them to what was
+then the known universe, at around 150 A.D.  Copernicus went on to apply them
+to the heliocentric model at the beginning of the sixteenth century.  Johannes
+Kepler discovered that the planets actually move in elliptical orbits in about
+1602.  The inverse-square law of gravity was suggested by Boulliau in 1645.
+Isaac Newton's Principia Mathematica was published in 1687, and proved that
+Kepler's laws derived from Newtonian gravitation.
+
 https://en.wikipedia.org/wiki/Deferent_and_epicycle
 
 Written by James Youngman; 1998.
diff --git a/hacks/config/etruscanvenus.xml b/hacks/config/etruscanvenus.xml
index 090b102..d4bff27 100644
--- a/hacks/config/etruscanvenus.xml
+++ b/hacks/config/etruscanvenus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<screensaver name="etruscanvenus" _label="EtruscanVenus" gl="yes">
+<screensaver name="etruscanvenus" _label="Etruscan Venus" gl="yes">
 
   <video href="https://www.youtube.com/watch?v=p3MgGyie6-I"/>
 
@@ -98,7 +98,7 @@
 
      <number id="delay" type="slider" arg="-delay %"
              _label="Frame rate" _low-label="Low" _high-label="High"
-             low="0" high="100000" default="10000"
+             low="0" high="100000" default="25000"
              convert="invert"/>
     </vgroup>
 
diff --git a/hacks/config/euler2d.xml b/hacks/config/euler2d.xml
index 31222e6..125ae27 100644
--- a/hacks/config/euler2d.xml
+++ b/hacks/config/euler2d.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="euler2d" _label="Euler2D">
+<screensaver name="euler2d" _label="Euler 2D">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/fadeplot.xml b/hacks/config/fadeplot.xml
index a977c2b..ddca5e8 100644
--- a/hacks/config/fadeplot.xml
+++ b/hacks/config/fadeplot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="fadeplot" _label="FadePlot">
+<screensaver name="fadeplot" _label="Fade Plot">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/fiberlamp.xml b/hacks/config/fiberlamp.xml
index b07e863..13787f5 100644
--- a/hacks/config/fiberlamp.xml
+++ b/hacks/config/fiberlamp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="fiberlamp" _label="Fiberlamp">
+<screensaver name="fiberlamp" _label="Fiber Lamp">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/filmleader.xml b/hacks/config/filmleader.xml
index 02b4fd7..45afd2e 100644
--- a/hacks/config/filmleader.xml
+++ b/hacks/config/filmleader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="filmleader" _label="FilmLeader">
+<screensaver name="filmleader" _label="Film Leader">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/flipflop.xml b/hacks/config/flipflop.xml
index 7f843a3..398a4fd 100644
--- a/hacks/config/flipflop.xml
+++ b/hacks/config/flipflop.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="flipflop" _label="FlipFlop" gl="yes">
+<screensaver name="flipflop" _label="Flip Flop" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/flipscreen3d.xml b/hacks/config/flipscreen3d.xml
index 5ed1cfb..9143de0 100644
--- a/hacks/config/flipscreen3d.xml
+++ b/hacks/config/flipscreen3d.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="flipscreen3d" _label="FlipScreen3D" gl="yes">
+<screensaver name="flipscreen3d" _label="Flip Screen 3D" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/fliptext.xml b/hacks/config/fliptext.xml
index 48c7e64..0128c64 100644
--- a/hacks/config/fliptext.xml
+++ b/hacks/config/fliptext.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="fliptext" _label="FlipText" gl="yes">
+<screensaver name="fliptext" _label="Flip Text" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/fluidballs.xml b/hacks/config/fluidballs.xml
index 2acd92c..36335fa 100644
--- a/hacks/config/fluidballs.xml
+++ b/hacks/config/fluidballs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="fluidballs" _label="FluidBalls">
+<screensaver name="fluidballs" _label="Fluid Balls">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/flyingtoasters.xml b/hacks/config/flyingtoasters.xml
index 6b5f1f1..37b6c1c 100644
--- a/hacks/config/flyingtoasters.xml
+++ b/hacks/config/flyingtoasters.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="flyingtoasters" _label="FlyingToasters" gl="yes">
+<screensaver name="flyingtoasters" _label="Flying Toasters" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/fontglide.xml b/hacks/config/fontglide.xml
index db437d3..fa818a2 100644
--- a/hacks/config/fontglide.xml
+++ b/hacks/config/fontglide.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="fontglide" _label="FontGlide">
+<screensaver name="fontglide" _label="Font Glide">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/fuzzyflakes.xml b/hacks/config/fuzzyflakes.xml
index b59517d..96f8389 100644
--- a/hacks/config/fuzzyflakes.xml
+++ b/hacks/config/fuzzyflakes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="fuzzyflakes" _label="FuzzyFlakes">
+<screensaver name="fuzzyflakes" _label="Fuzzy Flakes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/gears.xml b/hacks/config/gears.xml
index 957fbdb..a1cbaeb 100644
--- a/hacks/config/gears.xml
+++ b/hacks/config/gears.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <screensaver name="gears" _label="Gears" gl="yes">
 
@@ -29,7 +29,7 @@
   <xscreensaver-updater />
 
   <_description>
-Interlocking gears.  See also the "Pinion" and "MoebiusGears" screen savers.
+Interlocking gears.  See also the "Pinion" and "Möbius Gears" screen savers.
 
 https://en.wikipedia.org/wiki/Involute_gear
 https://en.wikipedia.org/wiki/Epicyclic_gearing
diff --git a/hacks/config/geodesicgears.xml b/hacks/config/geodesicgears.xml
index 813268a..3922f70 100644
--- a/hacks/config/geodesicgears.xml
+++ b/hacks/config/geodesicgears.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="geodesicgears" _label="GeodesicGears" gl="yes">
+<screensaver name="geodesicgears" _label="Geodesic Gears" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/glblur.xml b/hacks/config/glblur.xml
index ffa953d..7aa6c52 100644
--- a/hacks/config/glblur.xml
+++ b/hacks/config/glblur.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="glblur" _label="GLBlur" gl="yes">
+<screensaver name="glblur" _label="GL Blur" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/glcells.xml b/hacks/config/glcells.xml
index da86fe6..6d6cdca 100644
--- a/hacks/config/glcells.xml
+++ b/hacks/config/glcells.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="glcells" _label="GLCells" gl="yes">
+<screensaver name="glcells" _label="GL Cells" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/glforestfire.xml b/hacks/config/glforestfire.xml
index 08f882c..a479f7f 100644
--- a/hacks/config/glforestfire.xml
+++ b/hacks/config/glforestfire.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="glforestfire" _label="GLForestFire" gl="yes">
+<screensaver name="glforestfire" _label="GL Forest Fire" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/glhanoi.xml b/hacks/config/glhanoi.xml
index 6d9aec2..825be84 100644
--- a/hacks/config/glhanoi.xml
+++ b/hacks/config/glhanoi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
                                                                                 
-<screensaver name="glhanoi" _label="GLHanoi" gl="yes">
+<screensaver name="glhanoi" _label="GL Hanoi" gl="yes">
 
  <command arg="-root"/>
 
diff --git a/hacks/config/glknots.xml b/hacks/config/glknots.xml
index afdd296..ec50ae9 100644
--- a/hacks/config/glknots.xml
+++ b/hacks/config/glknots.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="glknots" _label="GLKnots" gl="yes">
+<screensaver name="glknots" _label="GL Knots" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/glmatrix.xml b/hacks/config/glmatrix.xml
index 18293da..b4cfd9a 100644
--- a/hacks/config/glmatrix.xml
+++ b/hacks/config/glmatrix.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="glmatrix" _label="GLMatrix" gl="yes">
+<screensaver name="glmatrix" _label="GL Matrix" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/glplanet.xml b/hacks/config/glplanet.xml
index 802f629..2958d42 100644
--- a/hacks/config/glplanet.xml
+++ b/hacks/config/glplanet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="glplanet" _label="GLPlanet" gl="yes">
+<screensaver name="glplanet" _label="GL Planet" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/glschool.xml b/hacks/config/glschool.xml
index a79ce12..ca5bb1d 100644
--- a/hacks/config/glschool.xml
+++ b/hacks/config/glschool.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="glschool" _label="GLSchool" gl="yes">
+<screensaver name="glschool" _label="GL School" gl="yes">
 
  <command arg="-root"/>
 
diff --git a/hacks/config/glslideshow.xml b/hacks/config/glslideshow.xml
index c92a6de..74f67b2 100644
--- a/hacks/config/glslideshow.xml
+++ b/hacks/config/glslideshow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="glslideshow" _label="GLSlideshow" gl="yes">
+<screensaver name="glslideshow" _label="GL Slideshow" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/glsnake.xml b/hacks/config/glsnake.xml
index d73663d..36c1821 100644
--- a/hacks/config/glsnake.xml
+++ b/hacks/config/glsnake.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="glsnake" _label="GLSnake" gl="yes">
+<screensaver name="glsnake" _label="GL Snake" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/gltext.xml b/hacks/config/gltext.xml
index 99ec92f..48b5076 100644
--- a/hacks/config/gltext.xml
+++ b/hacks/config/gltext.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="gltext" _label="GLText" gl="yes">
+<screensaver name="gltext" _label="GL Text" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/gravitywell.xml b/hacks/config/gravitywell.xml
index ebecd1c..eb8d190 100644
--- a/hacks/config/gravitywell.xml
+++ b/hacks/config/gravitywell.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="gravitywell" _label="GravityWell" gl="yes">
+<screensaver name="gravitywell" _label="Gravity Well" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/headroom.xml b/hacks/config/headroom.xml
new file mode 100644
index 0000000..b176a33
--- /dev/null
+++ b/hacks/config/headroom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<screensaver name="headroom" _label="Headroom" gl="yes">
+
+  <command arg="-root"/>
+
+  <video href="https://www.youtube.com/watch?v=kuS_HK4bIFI"/>
+
+  <number id="delay" type="slider" arg="-delay %"
+          _label="Frame rate" _low-label="Low" _high-label="High"
+          low="0" high="100000" default="20000"
+          convert="invert"/>
+
+  <number id="spikespeed" type="slider" arg="-speed %"
+          _label="Spike growth" _low-label="Slow" _high-label="Fast"
+          low="0.1" high="10.0" default="1.0"/>
+
+    <select id="rotation">
+     <option id="no"  _label="Don't wobble"               arg-set="-spin 0"/>
+     <option id="x"   _label="Wobble around X axis"       arg-set="-spin X"/>
+     <option id="y"   _label="Wobble around Y axis"       arg-set="-spin Y"/>
+     <option id="z"   _label="Wobble around Z axis"       arg-set="-spin Z"/>
+     <option id="xy"  _label="Wobble around X and Y axes" arg-set="-spin XY"/>
+     <option id="xz"  _label="Wobble around X and Z axes" arg-set="-spin XZ"/>
+     <option id="yz"  _label="Wobble around Y and Z axes" arg-set="-spin YZ"/>
+     <option id="xyz" _label="Wobble around all three axes"/>
+    </select>
+
+  <hgroup>
+   <boolean id="wander" _label="Wander"    arg-set="-wander"/>
+   <boolean id="wire"   _label="Wireframe" arg-set="-wireframe"/>
+   <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+  </hgroup>
+
+  <xscreensaver-updater />
+
+  <_description>
+"Back in my day, we used to say 'No future'.  Well.  This is it."
+-- Blank Reg
+
+"I can dump down all the information in the mind.  Then I can eliminate any
+information I don't want. My parrot squawks in much the same way. For the
+moment, the computer power is only enough to generate a human head."
+-- Bryce Lynch
+
+Written by Jamie Zawinski; 2020.
+  </_description>
+</screensaver>
diff --git a/hacks/config/hexstrut.xml b/hacks/config/hexstrut.xml
index 0823dc8..679a672 100644
--- a/hacks/config/hexstrut.xml
+++ b/hacks/config/hexstrut.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="hexstrut" _label="Hexstrut" gl="yes">
+<screensaver name="hexstrut" _label="Hex Strut" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/hyperball.xml b/hacks/config/hyperball.xml
index 8f674d2..75c679c 100644
--- a/hacks/config/hyperball.xml
+++ b/hacks/config/hyperball.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="hyperball" _label="HyperBall">
+<screensaver name="hyperball" _label="Hyperball">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/hypercube.xml b/hacks/config/hypercube.xml
index f471230..857d3a6 100644
--- a/hacks/config/hypercube.xml
+++ b/hacks/config/hypercube.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="hypercube" _label="HyperCube">
+<screensaver name="hypercube" _label="Hypercube">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/hypnowheel.xml b/hacks/config/hypnowheel.xml
index ae8975c..27a45a6 100644
--- a/hacks/config/hypnowheel.xml
+++ b/hacks/config/hypnowheel.xml
@@ -44,7 +44,7 @@
   <xscreensaver-updater />
 
   <_description>
-A overlapping, translucent spiral patterns.
+Overlapping, translucent spiral patterns.
 The tightness of their spirals fluctuates in and out.
 
 https://en.wikipedia.org/wiki/Moire_pattern
diff --git a/hacks/config/imsmap.xml b/hacks/config/imsmap.xml
index f0feda9..ea92c08 100644
--- a/hacks/config/imsmap.xml
+++ b/hacks/config/imsmap.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="imsmap" _label="IMSMap">
+<screensaver name="imsmap" _label="IMS Map">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/jigglypuff.xml b/hacks/config/jigglypuff.xml
index 832bbef..f2d63c0 100644
--- a/hacks/config/jigglypuff.xml
+++ b/hacks/config/jigglypuff.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="jigglypuff" _label="JigglyPuff" gl="yes">
+<screensaver name="jigglypuff" _label="Jiggly Puff" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/juggler3d.xml b/hacks/config/juggler3d.xml
index 0e136f2..80d0c02 100644
--- a/hacks/config/juggler3d.xml
+++ b/hacks/config/juggler3d.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="juggler3d" _label="Juggler3D" gl="yes">
+<screensaver name="juggler3d" _label="Juggler 3D" gl="yes">
   <command arg="-root"/>
 
   <video href="https://www.youtube.com/watch?v=TJkKaXBOvCA"/>
diff --git a/hacks/config/klein.xml b/hacks/config/klein.xml
index 4880eb0..e0e3b36 100644
--- a/hacks/config/klein.xml
+++ b/hacks/config/klein.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <screensaver name="klein" _label="Klein" gl="yes">
 
@@ -111,7 +111,7 @@
 
      <number id="delay" type="slider" arg="-delay %"
              _label="Frame rate" _low-label="Low" _high-label="High"
-             low="0" high="100000" default="10000"
+             low="0" high="100000" default="25000"
              convert="invert"/>
 
      <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
@@ -121,7 +121,7 @@
   <xscreensaver-updater />
 
   <_description>
-A Klein bottle is the 4D analog of a moebius strip.
+A Klein bottle is the 4D analog of a möbius strip.
 
 You can walk on the surface of the bottle or rotate it in 4D or walk
 on it while it rotates in 4D.  Inspired by Thomas Banchoff's book
diff --git a/hacks/config/lcdscrub.xml b/hacks/config/lcdscrub.xml
index c92b125..7cfd3d1 100644
--- a/hacks/config/lcdscrub.xml
+++ b/hacks/config/lcdscrub.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="lcdscrub" _label="LCDscrub">
+<screensaver name="lcdscrub" _label="LCD Scrub">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/maze3d.xml b/hacks/config/maze3d.xml
index ac578da..332c433 100755
--- a/hacks/config/maze3d.xml
+++ b/hacks/config/maze3d.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="maze3d" _label="Maze3D" gl="yes">
+<screensaver name="maze3d" _label="Maze 3D" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/memscroller.xml b/hacks/config/memscroller.xml
index ccb6c0a..ef70552 100644
--- a/hacks/config/memscroller.xml
+++ b/hacks/config/memscroller.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="memscroller" _label="MemScroller">
+<screensaver name="memscroller" _label="Mem Scroller">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/menger.xml b/hacks/config/menger.xml
index 760167e..b3bfba0 100644
--- a/hacks/config/menger.xml
+++ b/hacks/config/menger.xml
@@ -41,7 +41,7 @@
 
   <_description>
 The Menger Gasket is a cube-based recursive fractal object
-analagous to the Sierpinski Tetrahedron.
+analogous to the Sierpinski Tetrahedron.
 
 https://en.wikipedia.org/wiki/Menger_sponge
 https://en.wikipedia.org/wiki/Sierpinski_carpet
diff --git a/hacks/config/metaballs.xml b/hacks/config/metaballs.xml
index 0d1a218..5b73beb 100644
--- a/hacks/config/metaballs.xml
+++ b/hacks/config/metaballs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="metaballs" _label="MetaBalls">
+<screensaver name="metaballs" _label="Meta Balls">
 
   <command arg="-root"/>
 
@@ -27,14 +27,14 @@
    <vgroup>
 
     <number id="count" type="slider" arg="-count %"
-            _label="Metaball count" _low-label="Two" _high-label="Many"
+            _label="Ball count" _low-label="Two" _high-label="Many"
             low="2" high="255" default="10"/>
 
     <number id="radius" type="slider" arg="-radius %"
-            _label="MetaBall Radius" _low-label="Small" _high-label="Big" low="2" high="100" default="100"/>
+            _label="Ball Radius" _low-label="Small" _high-label="Big" low="2" high="100" default="100"/>
 
     <number id="delta" type="slider" arg="-delta %"
-            _label="MetaBall Movement" _low-label="Small" _high-label="Big" low="1" high="20" default="3"/>
+            _label="Ball Movement" _low-label="Small" _high-label="Big" low="1" high="20" default="3"/>
 
    </vgroup>
   </hgroup>
diff --git a/hacks/config/mirrorblob.xml b/hacks/config/mirrorblob.xml
index 74b1015..2d920e3 100644
--- a/hacks/config/mirrorblob.xml
+++ b/hacks/config/mirrorblob.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="mirrorblob" _label="MirrorBlob" gl="yes">
+<screensaver name="mirrorblob" _label="Mirror Blob" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/moebius.xml b/hacks/config/moebius.xml
index 324c527..1df5a76 100644
--- a/hacks/config/moebius.xml
+++ b/hacks/config/moebius.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
-<screensaver name="moebius" _label="Moebius" gl="yes">
+<screensaver name="moebius" _label="Möbius" gl="yes">
 
   <command arg="-root"/>
 
@@ -18,8 +18,8 @@
   <xscreensaver-updater />
 
   <_description>
-M. C. Escher's "Moebius Strip II", an image of ants walking along the
-surface of a moebius strip.
+M. C. Escher's "Möbius Strip II", an image of ants walking along the
+surface of a möbius strip.
 
 https://en.wikipedia.org/wiki/Moebius_strip
 https://en.wikipedia.org/wiki/Maurits_Cornelis_Escher
diff --git a/hacks/config/moebiusgears.xml b/hacks/config/moebiusgears.xml
index 9233f91..b46ba59 100644
--- a/hacks/config/moebiusgears.xml
+++ b/hacks/config/moebiusgears.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
-<screensaver name="moebiusgears" _label="MoebiusGears" gl="yes">
+<screensaver name="moebiusgears" _label="Möbius Gears" gl="yes">
 
   <command arg="-root"/>
 
@@ -36,7 +36,7 @@
 
   <_description>
 An interlinked loop of rotating gears.  The layout of the gears
-follows the path of a moebius strip.  See also the "Pinion" and
+follows the path of a möbius strip.  See also the "Pinion" and
 "Gears" screen savers.
 
 https://en.wikipedia.org/wiki/Involute_gear
diff --git a/hacks/config/moire.xml b/hacks/config/moire.xml
index 9c3f558..4970832 100644
--- a/hacks/config/moire.xml
+++ b/hacks/config/moire.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
-<screensaver name="moire" _label="Moire">
+<screensaver name="moire" _label="Moiré">
 
   <command arg="-root"/>
 
@@ -29,7 +29,7 @@
   <_description>
   When the lines on the screen
   Make more lines in between,
-  That's a moire'!
+  That's a moiré!
 
 https://en.wikipedia.org/wiki/Moire_pattern
 
diff --git a/hacks/config/moire2.xml b/hacks/config/moire2.xml
index 1785df3..8b244eb 100644
--- a/hacks/config/moire2.xml
+++ b/hacks/config/moire2.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
-<screensaver name="moire2" _label="Moire2">
+<screensaver name="moire2" _label="Moiré 2">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/morph3d.xml b/hacks/config/morph3d.xml
index 0122fb7..31e138d 100644
--- a/hacks/config/morph3d.xml
+++ b/hacks/config/morph3d.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="morph3d" _label="Morph3D" gl="yes">
+<screensaver name="morph3d" _label="Morph 3D" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/nerverot.xml b/hacks/config/nerverot.xml
index ef6db85..8a123bc 100644
--- a/hacks/config/nerverot.xml
+++ b/hacks/config/nerverot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="nerverot" _label="NerveRot">
+<screensaver name="nerverot" _label="Nerve Rot">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/noseguy.xml b/hacks/config/noseguy.xml
index bfc1674..c2e82e5 100644
--- a/hacks/config/noseguy.xml
+++ b/hacks/config/noseguy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="noseguy" _label="NoseGuy">
+<screensaver name="noseguy" _label="Nose Guy">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/pacman.xml b/hacks/config/pacman.xml
index 5ef77d5..77e63e4 100644
--- a/hacks/config/pacman.xml
+++ b/hacks/config/pacman.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="pacman" _label="Pacman">
+<screensaver name="pacman" _label="Pac-Man">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/photopile.xml b/hacks/config/photopile.xml
index a174afd..5b888e3 100644
--- a/hacks/config/photopile.xml
+++ b/hacks/config/photopile.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="photopile" _label="Photopile" gl="yes">
+<screensaver name="photopile" _label="Photo Pile" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/pinion.xml b/hacks/config/pinion.xml
index edb4f0e..31aa52d 100644
--- a/hacks/config/pinion.xml
+++ b/hacks/config/pinion.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <screensaver name="pinion" _label="Pinion" gl="yes">
 
@@ -40,7 +40,7 @@
 
   <_description>
 A gear system marches across the screen.
-See also the "Gears" and "MoebiusGears" screen savers.
+See also the "Gears" and "Möbius Gears" screen savers.
 
 https://en.wikipedia.org/wiki/Involute_gear
 
diff --git a/hacks/config/popsquares.xml b/hacks/config/popsquares.xml
index 8bc519a..6528b69 100644
--- a/hacks/config/popsquares.xml
+++ b/hacks/config/popsquares.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="popsquares" _label="PopSquares">
+<screensaver name="popsquares" _label="Pop Squares">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/projectiveplane.xml b/hacks/config/projectiveplane.xml
index 996d010..1c58c1d 100644
--- a/hacks/config/projectiveplane.xml
+++ b/hacks/config/projectiveplane.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="projectiveplane" _label="ProjectivePlane" gl="yes">
+<screensaver name="projectiveplane" _label="Projective Plane" gl="yes">
 
   <command arg="-root"/>
 
@@ -111,7 +111,7 @@
      <hgroup>
      <number id="delay" type="slider" arg="-delay %"
              _label="Frame rate" _low-label="Low" _high-label="High"
-             low="0" high="100000" default="10000"
+             low="0" high="100000" default="25000"
              convert="invert"/>
      </hgroup>
     </vgroup>
diff --git a/hacks/config/quasicrystal.xml b/hacks/config/quasicrystal.xml
index 0823c89..0496d79 100644
--- a/hacks/config/quasicrystal.xml
+++ b/hacks/config/quasicrystal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="quasicrystal" _label="QuasiCrystal" gl="yes">
+<screensaver name="quasicrystal" _label="Quasi-Crystal" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/raverhoop.xml b/hacks/config/raverhoop.xml
index 4932255..89936e6 100644
--- a/hacks/config/raverhoop.xml
+++ b/hacks/config/raverhoop.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="raverhoop" _label="RaverHoop" gl="yes">
+<screensaver name="raverhoop" _label="Raver Hoop" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/razzledazzle.xml b/hacks/config/razzledazzle.xml
index 043788e..20bd489 100644
--- a/hacks/config/razzledazzle.xml
+++ b/hacks/config/razzledazzle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="razzledazzle" _label="RazzleDazzle" gl="yes">
+<screensaver name="razzledazzle" _label="Razzle Dazzle" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/rd-bomb.xml b/hacks/config/rd-bomb.xml
index c8a656d..a6cc47d 100644
--- a/hacks/config/rd-bomb.xml
+++ b/hacks/config/rd-bomb.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="rd-bomb" _label="RDbomb">
+<screensaver name="rd-bomb" _label="RD-Bomb">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/romanboy.xml b/hacks/config/romanboy.xml
index 941317c..4cd6259 100644
--- a/hacks/config/romanboy.xml
+++ b/hacks/config/romanboy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<screensaver name="romanboy" _label="RomanBoy" gl="yes">
+<screensaver name="romanboy" _label="Roman Boy" gl="yes">
 
   <video href="https://www.youtube.com/watch?v=KEW5TuPbWyg"/>
 
@@ -101,7 +101,7 @@
 
      <number id="delay" type="slider" arg="-delay %"
              _label="Frame rate" _low-label="Low" _high-label="High"
-             low="0" high="100000" default="10000"
+             low="0" high="100000" default="25000"
              convert="invert"/>
     </vgroup>
 
diff --git a/hacks/config/rotzoomer.xml b/hacks/config/rotzoomer.xml
index d610fcb..c333d95 100644
--- a/hacks/config/rotzoomer.xml
+++ b/hacks/config/rotzoomer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="rotzoomer" _label="RotZoomer">
+<screensaver name="rotzoomer" _label="Rot Zoomer">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/rubikblocks.xml b/hacks/config/rubikblocks.xml
index de96caf..50ab78b 100644
--- a/hacks/config/rubikblocks.xml
+++ b/hacks/config/rubikblocks.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="rubikblocks" _label="RubikBlocks" gl="yes">
+<screensaver name="rubikblocks" _label="Rubik Blocks" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/shadebobs.xml b/hacks/config/shadebobs.xml
index f34c5b9..7ea34a0 100644
--- a/hacks/config/shadebobs.xml
+++ b/hacks/config/shadebobs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="shadebobs" _label="ShadeBobs">
+<screensaver name="shadebobs" _label="Shade Bobs">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/sierpinski3d.xml b/hacks/config/sierpinski3d.xml
index 782fe9d..c7dcd3b 100644
--- a/hacks/config/sierpinski3d.xml
+++ b/hacks/config/sierpinski3d.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="sierpinski3d" _label="Sierpinski3D" gl="yes">
+<screensaver name="sierpinski3d" _label="Sierpinski 3D" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/skytentacles.xml b/hacks/config/skytentacles.xml
index e6d1b5b..9436760 100644
--- a/hacks/config/skytentacles.xml
+++ b/hacks/config/skytentacles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="skytentacles" _label="SkyTentacles" gl="yes">
+<screensaver name="skytentacles" _label="Sky Tentacles" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/slidescreen.xml b/hacks/config/slidescreen.xml
index 3018998..ec76d77 100644
--- a/hacks/config/slidescreen.xml
+++ b/hacks/config/slidescreen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="slidescreen" _label="SlideScreen">
+<screensaver name="slidescreen" _label="Slide Screen">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/speedmine.xml b/hacks/config/speedmine.xml
index cf7b88a..90ee0bb 100644
--- a/hacks/config/speedmine.xml
+++ b/hacks/config/speedmine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="speedmine" _label="SpeedMine">
+<screensaver name="speedmine" _label="Speed Mine">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/sphereeversion.xml b/hacks/config/sphereeversion.xml
new file mode 100644
index 0000000..365db9b
--- /dev/null
+++ b/hacks/config/sphereeversion.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<screensaver name="sphereeversion" _label="Sphere Eversion" gl="yes">
+
+  <video href="https://www.youtube.com/watch?v=CbmIggJ5GdA"/>
+
+  <command arg="-root"/>
+
+  <hgroup>
+
+    <vgroup>
+      <number id="deform-speed" type="slider" arg="-deformation-speed %"
+              _label="Deformation speed"
+              _low-label="1.0" _high-label="100.0"
+              low="1.0" high="100.0" default="10.0"/>
+
+      <select id="surface-order">
+        <option id="random" _label="Random surface order"/>
+        <option id="2"      _label="2" arg-set="-surface-order 2"/>
+        <option id="3"      _label="3" arg-set="-surface-order 3"/>
+        <option id="4"      _label="4" arg-set="-surface-order 4"/>
+        <option id="5"      _label="5" arg-set="-surface-order 5"/>
+      </select>
+    </vgroup>
+
+    <vgroup>
+      <select id="display-mode">
+        <option id="random"      _label="Random surface"/>
+        <option id="surface"     _label="Solid surface"       arg-set="-mode surface"/>
+        <option id="transparent" _label="Transparent surface" arg-set="-mode transparent"/>
+      </select>
+
+      <select id="appearance">
+        <option id="random" _label="Random pattern"/>
+        <option id="solid"  _label="Solid object"   arg-set="-appearance solid"/>
+        <option id="bands"  _label="Parallel bands" arg-set="-appearance parallel-bands"/>
+        <option id="bands"  _label="Meridian bands" arg-set="-appearance meridian-bands"/>
+      </select>
+
+      <select id="graticule">
+        <option id="random" _label="Random graticule"/>
+        <option id="bands"  _label="With graticule"    arg-set="-graticule on"/>
+        <option id="bands"  _label="Without graticule" arg-set="-graticule off"/>
+      </select>
+
+      <select id="colors">
+        <option id="random"   _label="Random coloration"/>
+        <option id="twosided" _label="Two-sided"       arg-set="-colors two-sided"/>
+        <option id="rainbow"  _label="Parallel colors" arg-set="-colors parallel"/>
+        <option id="rainbow"  _label="Meridian colors" arg-set="-colors meridian"/>
+      </select>
+
+      <select id="projection">
+        <option id="random"       _label="Random Projection"/>
+        <option id="perspective"  _label="Perspective"  arg-set="-projection perspective"/>
+        <option id="orthographic" _label="Orthographic" arg-set="-projection orthographic"/>
+      </select>
+    </vgroup>
+
+    <vgroup>
+      <number id="speed-x" type="slider" arg="-speed-x %"
+              _label="X rotation speed"
+              _low-label="-4.0" _high-label="4.0"
+              low="-4.0" high="4.0" default="0.0"/>
+
+      <number id="speed-y" type="slider" arg="-speed-y %"
+              _label="Y rotation speed"
+              _low-label="-4.0" _high-label="4.0"
+              low="-4.0" high="4.0" default="0.0"/>
+
+      <number id="speed-z" type="slider" arg="-speed-z %"
+              _label="Z rotation speed"
+              _low-label="-4.0" _high-label="4.0"
+              low="-4.0" high="4.0" default="0.0"/>
+    </vgroup>
+
+    <vgroup>
+     <xscreensaver-updater />
+     <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+    </vgroup>
+
+  </hgroup>
+
+  <_description>
+Turns a sphere inside out: a smooth deformation (homotopy).  During the
+eversion, the deformed sphere is allowed to intersect itself transversally,
+however, no creases or pinch points occur.
+
+Inspired by the following paper: Adam Bednorz, Witold Bednorz:
+"Analytic sphere eversion using ruled surfaces", Differential Geometry
+and its Applications 64:59-79, 2019.
+
+https://en.wikipedia.org/wiki/Sphere_eversion
+https://mathworld.wolfram.com/SphereEversion.html
+
+Written by Carsten Steger; 2020.
+  </_description>
+</screensaver>
diff --git a/hacks/config/spheremonics.xml b/hacks/config/spheremonics.xml
index fc4fa92..e88a5f9 100644
--- a/hacks/config/spheremonics.xml
+++ b/hacks/config/spheremonics.xml
@@ -15,7 +15,7 @@
 
     <number id="duration" type="slider" arg="-duration %"
             _label="Duration" _low-label="Short" _high-label="Long"
-            low="5" high="1000" default="100"/>
+            low="5" high="1000" default="200"/>
 
     <number id="resolution" type="slider" arg="-resolution %"
             _label="Resolution" _low-label="Low" _high-label="High"
diff --git a/hacks/config/spiral.xml b/hacks/config/spiral.xml
index 71e78c7..14d3e75 100644
--- a/hacks/config/spiral.xml
+++ b/hacks/config/spiral.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <screensaver name="spiral" _label="Spiral">
 
@@ -31,7 +31,7 @@
 This screen saver was removed from the XScreenSaver distribution as of
 version 5.08.
 
-Moving circular moire patterns.
+Moving circular moiré patterns.
 
 Written by Peter Schmitzberger; 1997.
   </_description>
diff --git a/hacks/config/splitflap.xml b/hacks/config/splitflap.xml
index 265c9b6..713a126 100644
--- a/hacks/config/splitflap.xml
+++ b/hacks/config/splitflap.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="splitflap" _label="SplitFlap" gl="yes">
+<screensaver name="splitflap" _label="Split-Flap" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/starwars.xml b/hacks/config/starwars.xml
index caa005e..2f4e90e 100644
--- a/hacks/config/starwars.xml
+++ b/hacks/config/starwars.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="starwars" _label="StarWars" gl="yes">
+<screensaver name="starwars" _label="Star Wars" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/stonerview.xml b/hacks/config/stonerview.xml
index 5db55f5..72daad1 100644
--- a/hacks/config/stonerview.xml
+++ b/hacks/config/stonerview.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="stonerview" _label="StonerView" gl="yes">
+<screensaver name="stonerview" _label="Stoner View" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/surfaces.xml b/hacks/config/surfaces.xml
index 92a184a..b5508ae 100644
--- a/hacks/config/surfaces.xml
+++ b/hacks/config/surfaces.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <screensaver name="surfaces" _label="Surfaces" gl="yes">
 
@@ -25,7 +25,7 @@
      <option id="dini"      _label="Dini's Surface"      arg-set="-surface dini"/>
      <option id="enneper"   _label="Enneper's Surface"   arg-set="-surface enneper"/>
      <option id="kuen"      _label="Kuen Surface"        arg-set="-surface kuen"/>
-     <option id="moebius"   _label="Moebius Strip"       arg-set="-surface moebius"/>
+     <option id="moebius"   _label="Möbius Strip"        arg-set="-surface moebius"/>
      <option id="seashell"  _label="Seashell"            arg-set="-surface seashell"/>
      <option id="swallow"   _label="Swallowtail"         arg-set="-surface swallowtail"/>
      <option id="bohemian"  _label="Bohemian Dome"       arg-set="-surface bohemian"/>
diff --git a/hacks/config/testx11.xml b/hacks/config/testx11.xml
index aaf85a7..bbc678b 100644
--- a/hacks/config/testx11.xml
+++ b/hacks/config/testx11.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<screensaver name="testx11" _label="TestX11">
+<screensaver name="testx11" _label="Test X11">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/timetunnel.xml b/hacks/config/timetunnel.xml
index caab9fc..f543150 100644
--- a/hacks/config/timetunnel.xml
+++ b/hacks/config/timetunnel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="timetunnel" _label="TimeTunnel" gl="yes">
+<screensaver name="timetunnel" _label="Time Tunnel" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/topblock.xml b/hacks/config/topblock.xml
index df498bc..39dff21 100644
--- a/hacks/config/topblock.xml
+++ b/hacks/config/topblock.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="topblock" _label="TopBlock" gl="yes">
+<screensaver name="topblock" _label="Top Block" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/tronbit.xml b/hacks/config/tronbit.xml
index 965d333..c7cc3a5 100644
--- a/hacks/config/tronbit.xml
+++ b/hacks/config/tronbit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="tronbit" _label="TronBit" gl="yes">
+<screensaver name="tronbit" _label="Tron Bit" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/unknownpleasures.xml b/hacks/config/unknownpleasures.xml
index 8cac817..956c3f3 100644
--- a/hacks/config/unknownpleasures.xml
+++ b/hacks/config/unknownpleasures.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="unknownpleasures" _label="UnknownPleasures" gl="yes">
+<screensaver name="unknownpleasures" _label="Unknown Pleasures" gl="yes">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/vidwhacker.xml b/hacks/config/vidwhacker.xml
index e1fade1..9884541 100644
--- a/hacks/config/vidwhacker.xml
+++ b/hacks/config/vidwhacker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="vidwhacker" _label="VidWhacker">
+<screensaver name="vidwhacker" _label="Vid Whacker">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/webcollage.xml b/hacks/config/webcollage.xml
index c26ea98..9c76910 100644
--- a/hacks/config/webcollage.xml
+++ b/hacks/config/webcollage.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="webcollage" _label="WebCollage">
+<screensaver name="webcollage" _label="Web Collage">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/whirlwindwarp.xml b/hacks/config/whirlwindwarp.xml
index 7cd774e..c92b6fe 100644
--- a/hacks/config/whirlwindwarp.xml
+++ b/hacks/config/whirlwindwarp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="whirlwindwarp" _label="WhirlWindWarp">
+<screensaver name="whirlwindwarp" _label="Whirlwind Warp">
 
   <command arg="-root"/>
 
diff --git a/hacks/config/winduprobot.xml b/hacks/config/winduprobot.xml
index 0aaf78a..1312743 100644
--- a/hacks/config/winduprobot.xml
+++ b/hacks/config/winduprobot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="winduprobot" _label="WindupRobot" gl="yes">
+<screensaver name="winduprobot" _label="Windup Robot" gl="yes">
 
   <command arg="-root"/>
 
-- 
cgit v1.2.3-55-g7522