diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index b509bbe1..8916870e 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -190,36 +190,38 @@ def makeTriggerFactory():
 # Organize the builder names into these lists to make it easier to specify them
 # for the schedulers below, as well as for creating the BuilderConfig objects.
 regularBuilders = [ 'build-osx-py27',
-                    'build-osx-py35',
                     'build-osx-py36',
                     'build-osx-py37',
+                    'build-osx-py38',
                     'build-gtk2-py27',
                     'build-gtk2-py36',
                     'build-gtk2-py37',
+                    'build-gtk2-py38',
                     'build-gtk3-py27',
                     'build-gtk3-py36',
                     'build-gtk3-py37',
+                    'build-gtk3-py38',
                     'build-win32-py27',
-                    'build-win32-py35',
                     'build-win32-py36',
                     'build-win32-py37',
+                    'build-win32-py38',
                     'build-win64-py27',
-                    'build-win64-py35',
                     'build-win64-py36',
                     'build-win64-py37',
+                    'build-win64-py38',
                     ]
 distBuilders = [    'dist-osx-py27',
-                    'dist-osx-py35',
                     'dist-osx-py36',
                     'dist-osx-py37',
+                    'dist-osx-py38',
                     'dist-win32-py27',
-                    'dist-win32-py35',
                     'dist-win32-py36',
                     'dist-win32-py37',
+                    'dist-win32-py38',
                     'dist-win64-py27',
-                    'dist-win64-py35',
                     'dist-win64-py36',
                     'dist-win64-py37',
+                    'dist-win64-py38',
                     ]
 otherBuilders = [   'dist-docs-py37',
                     'dist-src-py37',
@@ -236,7 +238,7 @@ def makeBuilderConfigs(builder_names):
                   'win32': ['windows-1', 'windows-2'],
                   'win64': ['windows-1', 'windows-2'],
                   'src':   ['linux-1',   'linux-2'],
-                  'docs':  ['windows-1', 'windows-1'], }
+                  'docs':  ['windows-1', 'windows-2'], }
         return pwmap[port]
     BCs = []
     for bname in builder_names:
@@ -359,6 +361,14 @@ c['www'] = dict(port=MASTER_WWW_PORT,
                 change_hook_auth=[strcred.makeChecker("file:changehook.passwd")],
                 )
 
+c['www']['ui_default_config'] = { 
+    'Waterfall.scaling_waterfall': 0.05852766346593507,
+    'Waterfall.lazy_limit_waterfall': 50,
+    'Waterfall.idle_threshold_waterfall': 180,
+    'Waterfall.show_builders_without_builds': True,
+    'LogPreview.loadlines': 50,
+    'LogPreview.maxlines': 50,
+}
 
 # TODO: Fix the security/auth stuff!!
 # Add security so only admins can start builds, etc.