diff --git a/en/gnome/images/Makefile b/en/gnome/images/Makefile
index c38678ab6e..30eb3fc972 100644
--- a/en/gnome/images/Makefile
+++ b/en/gnome/images/Makefile
@@ -1,45 +1,41 @@
-# $FreeBSD: www/en/gnome/images/Makefile,v 1.46 2006/09/19 19:51:25 ahze Exp $
+# $FreeBSD: www/en/gnome/images/Makefile,v 1.47 2006/10/14 16:37:04 marcus Exp $
.if exists(../Makefile.conf)
.include "../Makefile.conf"
.endif
.if exists(../Makefile.inc)
.include "../Makefile.inc"
.endif
# For screenshots, please create 320x240 thumbnails of the images, and name
# them -tn.png. This will minimize the load time for the index
# page. If your source shot isn't of normal geometry, restrict the height
# to 240 pixels and let the width vary. You can use the convert tool
# included with ImageMagick to do this:
#
# convert -geometry x240 .png -tn.png
#
# Screenshots should be named according to the GNOME release they show.
# E.g. the fourth screenshot for GNOME 2.6 is ss26-4.png, and the thumbnail
# is ss26-4-tn.png
-DATA= ss216-1-tn.png
-DATA+= ss216-1.png
-DATA+= ss216-2-tn.png
-DATA+= ss216-2.png
-DATA+= ss216-3-tn.png
-DATA+= ss216-3.png
-DATA+= ss216-4-tn.png
-DATA+= ss216-4.png
-DATA+= ss216-5-tn.png
-DATA+= ss216-5.png
+DATA= ss218-1-tn.png
+DATA+= ss218-1.png
+DATA+= ss218-2-tn.png
+DATA+= ss218-2.png
+DATA+= ss218-3-tn.png
+DATA+= ss218-3.png
DATA+= gnome.png
# FreeBSD GNOME Vanity Project
DATA+= adamw.jpg
DATA+= ahze.jpg
#DATA+= bland.jpg
DATA+= hippobutt.jpg
DATA+= kwm.jpg
DATA+= marcus.jpg
DATA+= mezz.jpg
DATA+= pav.jpg
.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/gnome/images/ss216-1-tn.png b/en/gnome/images/ss216-1-tn.png
deleted file mode 100644
index 7d0fbbce4b..0000000000
Binary files a/en/gnome/images/ss216-1-tn.png and /dev/null differ
diff --git a/en/gnome/images/ss216-1.png b/en/gnome/images/ss216-1.png
deleted file mode 100644
index 8170d05cc1..0000000000
Binary files a/en/gnome/images/ss216-1.png and /dev/null differ
diff --git a/en/gnome/images/ss216-2-tn.png b/en/gnome/images/ss216-2-tn.png
deleted file mode 100644
index ebdd8dd67e..0000000000
Binary files a/en/gnome/images/ss216-2-tn.png and /dev/null differ
diff --git a/en/gnome/images/ss216-2.png b/en/gnome/images/ss216-2.png
deleted file mode 100644
index a9859abed7..0000000000
Binary files a/en/gnome/images/ss216-2.png and /dev/null differ
diff --git a/en/gnome/images/ss216-3-tn.png b/en/gnome/images/ss216-3-tn.png
deleted file mode 100644
index 63135a448a..0000000000
Binary files a/en/gnome/images/ss216-3-tn.png and /dev/null differ
diff --git a/en/gnome/images/ss216-3.png b/en/gnome/images/ss216-3.png
deleted file mode 100644
index 8159b66d0c..0000000000
Binary files a/en/gnome/images/ss216-3.png and /dev/null differ
diff --git a/en/gnome/images/ss216-4-tn.png b/en/gnome/images/ss216-4-tn.png
deleted file mode 100644
index 31403c0dfb..0000000000
Binary files a/en/gnome/images/ss216-4-tn.png and /dev/null differ
diff --git a/en/gnome/images/ss216-4.png b/en/gnome/images/ss216-4.png
deleted file mode 100644
index 4e00bd541e..0000000000
Binary files a/en/gnome/images/ss216-4.png and /dev/null differ
diff --git a/en/gnome/images/ss216-5-tn.png b/en/gnome/images/ss216-5-tn.png
deleted file mode 100644
index 8bbf4ad066..0000000000
Binary files a/en/gnome/images/ss216-5-tn.png and /dev/null differ
diff --git a/en/gnome/images/ss216-5.png b/en/gnome/images/ss216-5.png
deleted file mode 100644
index c868038e40..0000000000
Binary files a/en/gnome/images/ss216-5.png and /dev/null differ
diff --git a/en/gnome/images/ss218-1-tn.png b/en/gnome/images/ss218-1-tn.png
new file mode 100644
index 0000000000..6d073b1d26
Binary files /dev/null and b/en/gnome/images/ss218-1-tn.png differ
diff --git a/en/gnome/images/ss218-1.png b/en/gnome/images/ss218-1.png
new file mode 100644
index 0000000000..54581c02e3
Binary files /dev/null and b/en/gnome/images/ss218-1.png differ
diff --git a/en/gnome/images/ss218-2-tn.png b/en/gnome/images/ss218-2-tn.png
new file mode 100644
index 0000000000..f77b12f34e
Binary files /dev/null and b/en/gnome/images/ss218-2-tn.png differ
diff --git a/en/gnome/images/ss218-2.png b/en/gnome/images/ss218-2.png
new file mode 100644
index 0000000000..72277089c7
Binary files /dev/null and b/en/gnome/images/ss218-2.png differ
diff --git a/en/gnome/images/ss218-3-tn.png b/en/gnome/images/ss218-3-tn.png
new file mode 100644
index 0000000000..79ff561e84
Binary files /dev/null and b/en/gnome/images/ss218-3-tn.png differ
diff --git a/en/gnome/images/ss218-3.png b/en/gnome/images/ss218-3.png
new file mode 100644
index 0000000000..ef85c89217
Binary files /dev/null and b/en/gnome/images/ss218-3.png differ
diff --git a/en/gnome/screenshots.sgml b/en/gnome/screenshots.sgml
index 62c05af4dd..bc13be1aed 100644
--- a/en/gnome/screenshots.sgml
+++ b/en/gnome/screenshots.sgml
@@ -1,62 +1,46 @@
-
+
]>
&header;
Here are some examples of GNOME running on FreeBSD. Click on the
thumbnails below to see a larger image.
GNOME &gnomever; Screenshots
- GNOME &gnomever; Desktop running beep-media-player, deskbar-applet,
- and eog showing off a picture of Dominiques holiday in Portugal,
- all with French locales.
- 

- Contributed by Dominique Goncalves < dominique.goncalves |at|
- gmail.com >
+ Contributed by Tom McLaughlin < tmclaugh |at|
+ FreeBSD.org >
- A mobile Spanish Desktop with Wifi and Blue-tooth scanner, Nautilus,
- Volume Manager, and Evince running.
- 

- Contributed by Phillip Neumann < pneumann |at|
+ Contributed by ckamus < ckamus |at|
gmail.com >
- A simple GNOME &gnomever; desktop with Ekiga VOIP phone, Hal Device Manager,
- and Epiphany looking at the FreeBSD GNOME web page. The theme is the default
- GNOME Clearlooks.
- 

- Contributed by Michael Johnson < ahze |at|
- FreeBSD.org >
-
- Showing off Tomboy, Hal Device Manager, Battery Applet, The Gimp,
- and Baobab Disk Usage Analyzer. GTK theme is Clearlooks-Human in Blue,
- Metacity theme is Brace2, and Icons are Still Life.
- 
- Contributed by Franz Klammer < klammer |at|
- webonaut.com >
+ Contributed by John Merryweather Cooper <
+ john_m_cooper |at| yahoo.com >
- Hard at work using The Gimp and GEdit with new side panel
- enhancements.
- 
- Contributed by Romain Tartiere < romain-tartiere |at|
- astase.com >
&footer;