diff --git a/branding/logos/DistArray Logo.svg b/branding/logos/DistArray-LOGO.svg
similarity index 100%
rename from branding/logos/DistArray Logo.svg
rename to branding/logos/DistArray-LOGO.svg
diff --git a/branding/logos/png's/DistArray-LOGO-large.png b/branding/logos/pngs/DistArray-LOGO-large.png
similarity index 100%
rename from branding/logos/png's/DistArray-LOGO-large.png
rename to branding/logos/pngs/DistArray-LOGO-large.png
diff --git a/branding/logos/png's/DistArray-LOGO-mid.png b/branding/logos/pngs/DistArray-LOGO-mid.png
similarity index 100%
rename from branding/logos/png's/DistArray-LOGO-mid.png
rename to branding/logos/pngs/DistArray-LOGO-mid.png
diff --git a/branding/logos/png's/DistArray-LOGO-small.png b/branding/logos/pngs/DistArray-LOGO-small.png
similarity index 100%
rename from branding/logos/png's/DistArray-LOGO-small.png
rename to branding/logos/pngs/DistArray-LOGO-small.png
diff --git a/branding/logos/png's/DistArray-LOGO-smallest.png b/branding/logos/pngs/DistArray-LOGO-smallest.png
similarity index 100%
rename from branding/logos/png's/DistArray-LOGO-smallest.png
rename to branding/logos/pngs/DistArray-LOGO-smallest.png
diff --git a/docs/sphinx/requirements.txt b/docs/sphinx/requirements.txt
index ff7ab812..a79e07cc 100644
--- a/docs/sphinx/requirements.txt
+++ b/docs/sphinx/requirements.txt
@@ -1,4 +1,3 @@
 mock
 sphinx
-sphinxcontrib-napoleon
 sphinxcontrib-programoutput
diff --git a/docs/sphinx/source/conf.py b/docs/sphinx/source/conf.py
index 57040aac..a58253f4 100644
--- a/docs/sphinx/source/conf.py
+++ b/docs/sphinx/source/conf.py
@@ -50,8 +50,11 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.mathjax',
-              'sphinx.ext.autosummary', 'sphinx.ext.napoleon',
+extensions = ['sphinx.ext.autodoc',
+              'sphinx.ext.mathjax',
+              'sphinx.ext.autosummary',
+              'sphinx.ext.napoleon',
+              'sphinx.ext.viewcode',
               'sphinxcontrib.programoutput']
 
 # Add any paths that contain templates here, relative to this directory.
@@ -137,7 +140,7 @@
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-html_logo = "../../../docs/www/output/images/distarray-logo.png"
+html_logo = "../../../branding/logos/pngs/DistArray-LOGO-smallest.png"
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32