diff --git a/bookmarks b/bookmarks
index c6d9a2c..6bc5c49 100644
--- a/bookmarks
+++ b/bookmarks
@@ -1,478 +1,81 @@
-# Bookmarks file for gFTP. Copyright (C) 1998-2002 Brian Masney
-# <masneyb@gftp.org>. Warning: Any comments that you add to this file WILL be
-# overwritten
+# =| gFTP bookmarks |=
+#
+# (C) 1998-2002 Brian Masney <masneyb@gftp.org>
+# (C) 2009-2018 Jayvee Enaguas <harvettfox96@protonmail.com>
+#
+# Warning: Any comments that you add to this file WILL be overwritten
 
-[BSD Sites/FreeBSD]
-hostname=ftp.freebsd.org
+[General sites/GNU Project]
+hostname=ftp.gnu.org
 port=21
 protocol=FTP
-remote directory=/pub/FreeBSD
+remote directory=/pub/gnu/
 local directory=
 username=anonymous
 password=@EMAIL@
 account=
 
-[BSD Sites/NetBSD]
-hostname=ftp.netbsd.org
+[General sites/ibiblio]
+hostname=ftp.ibiblio.org
 port=21
 protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[BSD Sites/OpenBSD]
-hostname=ftp.openbsd.org
-port=21
-protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Debian Sites/Debian]
-hostname=ftp.debian.org
-port=21
-protocol=FTP
-remote directory=/debian
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Debian Sites/Debian non-US]
-hostname=non-us.debian.org
-port=21
-protocol=FTP
-remote directory=/
+remote directory=/pub/Linux/
 local directory=
 username=anonymous
 password=@EMAIL@
 account=
 
-[Debian Sites/Freshmeat DEBs]
-hostname=ftp.freshmeat.net
+[General sites/TSX-11]
+hostname=ftp.ibiblio.org
 port=21
 protocol=FTP
-remote directory=/pub/debs
+remote directory=/pub/historic-linux/ftp-archives/tsx-11.mit.edu/
 local directory=
 username=anonymous
 password=@EMAIL@
 account=
 
-[General Sites/gFTP]
-hostname=www.gftp.org
-port=21
-protocol=FTP
-remote directory=/pub/gftp
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[General Sites/GNU Archive]
-hostname=prep.ai.mit.edu
-port=21
-protocol=FTP
-remote directory=/pub/gnu
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[General Sites/Kernel.Org]
-hostname=ftp.kernel.org
-port=21
-protocol=FTP
-remote directory=/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[General Sites/Ibiblio]
-hostname=ibiblio.unc.edu
-port=21
-protocol=FTP
-remote directory=/pub/Linux
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[General Sites/Micro$~1 =)]
-hostname=ftp.microsoft.com
-port=21
-protocol=FTP
-remote directory=/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[General Sites/Mozilla]
-hostname=ftp.mozilla.org
-port=21
-protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[General Sites/Rufus]
-hostname=rufus.w3.org
-port=21
-protocol=FTP
-remote directory=/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[General Sites/Source Forge]
-hostname=ftp.sourceforge.net
-port=21
-protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[General Sites/Tux.Org]
-hostname=ftp.tux.org
-port=21
-protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[General Sites/TSX-11]
-hostname=tsx-11.mit.edu
-port=21
-protocol=FTP
-remote directory=/pub/linux
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[General Sites/Wcarchive]
-hostname=ftp.cdrom.com
-port=21
-protocol=FTP
-remote directory=/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Mandriva Sites/Community SRPMS (California)]
-hostname=mirrors.usc.edu
-port=21
-protocol=FTP
-remote directory=/pub/linux/distributions/mandrakelinux/devel/community/SRPMS/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Mandriva Sites/Devel iso (California)]
-hostname=mirrors.usc.edu
-port=21
-protocol=FTP
-remote directory=/pub/linux/distributions/mandrakelinux/devel/iso/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Mandriva Sites/Official iso (California)]
-hostname=mirrors.usc.edu
-port=21
-protocol=FTP
-remote directory=/pub/linux/distributions/mandrakelinux/official/iso/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Mandriva Sites/Mandriva Old (California)]
-hostname=mirrors.usc.edu
-port=21
-protocol=FTP
-remote directory=/pub/linux/distributions/mandrakelinux/old/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Mandriva Sites/Community SRPMS (France)]
-hostname=ftp.ciril.fr
-port=21
-protocol=FTP
-remote directory=/pub/linux/mandrakelinux/devel/community/SRPMS/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Mandriva Sites/Devel iso (France)]
-hostname=ftp.ciril.fr
-port=21
-protocol=FTP
-remote directory=/pub/linux/mandrakelinux/devel/iso/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Mandriva Sites/Official iso (France)]
-hostname=ftp.ciril.fr
-port=21
-protocol=FTP
-remote directory=/pub/linux/mandrakelinux/official/iso/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Mandriva Sites/Community SRPMS (Taiwan)]
-hostname=ftp.isu.edu.tw
-port=21
-protocol=FTP
-remote directory=/pub/Linux/Mandrakelinux/devel/community/SRPMS/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Mandriva Sites/Devel iso (Taiwan)]
-hostname=ftp.isu.edu.tw
-port=21
-protocol=FTP
-remote directory=/pub/Linux/Mandrakelinux/devel/iso/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Mandriva Sites/Official iso (Taiwan)]
-hostname=ftp.isu.edu.tw
-port=21
-protocol=FTP
-remote directory=/pub/Linux/Mandrakelinux/official/iso/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Mandriva Sites/Mandriva Old (Taiwan)]
-hostname=ftp.isu.edu.tw
-port=21
-protocol=FTP
-remote directory=/pub/Linux/Mandrakelinux/old/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[RedHat Sites/FalseHope RPMs]
-hostname=ftp.falsehope.com
-port=21
-protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[RedHat Sites/Freshmeat RPMs]
-hostname=ftp.freshmeat.net
-port=21
-protocol=FTP
-remote directory=/pub/rpms
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[RedHat Sites/RH Contrib]
-hostname=contrib.redhat.com
-port=21
-protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[RedHat Sites/RH Main]
-hostname=ftp.redhat.com
-port=21
-protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[RedHat Sites/RH Rawhide]
-hostname=rawhide.redhat.com
-port=21
-protocol=FTP
-remote directory=/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[RedHat Sites/RH Updates]
-hostname=updates.redhat.com
-port=21
-protocol=FTP
-remote directory=/
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[RedHat Sites/RPM.org]
-hostname=ftp.rpm.org
-port=21
-protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[RedHat Sites/Fresh RPMS]
-hostname=ftp.freshrpms.net
-port=21
-protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Slackware Sites/slackware.com]
-hostname=ftp.slackware.com
-port=21
-protocol=FTP
-remote directory=/pub/slackware/slackware
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[Slackware Sites/linuxmafia.org]
-hostname=packages.linuxmafia.org
-port=21
-protocol=FTP
-remote directory=/pub/slackware-7.0
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[SuSE Sites/SuSE]
-hostname=ftp.suse.com
-port=21
-protocol=FTP
-remote directory=/pub/suse/i386
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[SuSE Sites/SuSE Contrib]
-hostname=ftp.suse.com
-port=21
-protocol=FTP
-remote directory=/pub/contrib
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[SuSE Sites/SuSE Update]
-hostname=ftp.suse.com
-port=21
-protocol=FTP
-remote directory=/suse_update
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[X11 Sites/Gimp]
-hostname=ftp.gimp.org
-port=21
-protocol=FTP
-remote directory=/pub/gimp
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[X11 Sites/Gnome]
+[X11 sites/GIMP]
 hostname=ftp.gnome.org
 port=21
 protocol=FTP
-remote directory=/pub
-local directory=
-username=anonymous
-password=@EMAIL@
-account=
-
-[X11 Sites/GTK+]
-hostname=ftp.gtk.org
-port=21
-protocol=FTP
-remote directory=/pub/gtk
+remote directory=/pub/gimp/gimp/
 local directory=
 username=anonymous
 password=@EMAIL@
 account=
 
-[X11 Sites/KDE]
-hostname=ftp.kde.org
+[X11 sites/GNOME]
+hostname=ftp.gnome.org
 port=21
 protocol=FTP
-remote directory=/pub
+remote directory=/pub/
 local directory=
 username=anonymous
 password=@EMAIL@
 account=
 
-[X11 Sites/LessTif]
-hostname=ftp.hungry.com
+[X11 sites/GTK+]
+hostname=ftp.gnome.org
 port=21
 protocol=FTP
-remote directory=/pub/hungry/lesstif
+remote directory=/pub/gnome/sources/gtk+/
 local directory=
 username=anonymous
 password=@EMAIL@
 account=
 
-[X11 Sites/Qt]
-hostname=ftp.troll.no
+[X11 sites/Qt]
+hostname=ftp.gnome.org
 port=21
 protocol=FTP
-remote directory=/qt/source
+remote directory=/mirror/qt.io/qtproject/
 local directory=
 username=anonymous
 password=@EMAIL@
 account=
 
-[X11 Sites/XFree86]
+[X11 sites/XFree86]
 hostname=ftp.xfree86.org
 port=21
 protocol=FTP
@@ -482,13 +85,12 @@ username=anonymous
 password=@EMAIL@
 account=
 
-[X11 Sites/ftp.x.org]
+[X11 sites/X.org]
 hostname=ftp.x.org
 port=21
 protocol=FTP
-remote directory=/pub
+remote directory=/pub/
 local directory=
 username=anonymous
 password=@EMAIL@
 account=
-
