diff --git a/source/_static/css/theme_overrides.css b/source/_static/css/theme_overrides.css
index 3b7cf19..027694d 100644
--- a/source/_static/css/theme_overrides.css
+++ b/source/_static/css/theme_overrides.css
@@ -3,3 +3,9 @@ div.disclaimer {
     font-size: 10px;
     font-style: italic;
 }
+div.figure p.caption {
+    padding-top: 0.8em;
+}
+span.caption-number:after {
+    content: ": ";
+ }
diff --git a/source/conf.py b/source/conf.py
index fd04be6..f8414db 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -97,6 +97,12 @@ todo_include_todos = True
 
 # Figure numbering
 numfig = True
+numfig_format = {
+    'figure': 'Figure %s',
+    'table': 'Table %s',
+    'code-block': 'Listing %s',
+    'section': 'Section %s'
+}
 
 # -- Autodoc options ------------------------------------------------------