diff --git a/CHANGES.rst b/CHANGES.rst
index cb452653..ab27d704 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,10 @@ Changelog
 1.2.13 (unreleased)
 -------------------
 
+- Pull mark_special_links, external_links_open_new_window values
+  from configuration registry.
+  [esteele]
+
 - Fix visual glitch on Safari
   [davilima6]
 
@@ -11,6 +15,7 @@ Changelog
   Fixes https://github.com/plone/plone.app.theming/issues/70
   [tmassman]
 
+
 1.2.12 (2015-09-15)
 -------------------
 
diff --git a/src/plone/app/theming/browser/controlpanel.py b/src/plone/app/theming/browser/controlpanel.py
index 895ee437..dacc46f8 100644
--- a/src/plone/app/theming/browser/controlpanel.py
+++ b/src/plone/app/theming/browser/controlpanel.py
@@ -41,8 +41,6 @@ def authorize(context, request):
 class ThemingControlpanel(BrowserView):
 
     def __call__(self):
-        ptool = getToolByName(self.context, 'portal_properties')
-        self.props = ptool.site_properties
         self.pskin = getToolByName(self.context, 'portal_skins')
         registry = getUtility(IRegistry)
         self.settings = registry.forInterface(
@@ -79,21 +77,10 @@ def redirect(self, url):
         self.request.response.redirect(url)
 
     def get_mark_special_links(self):
-        msl = getattr(self.props, 'mark_special_links', False)
-        if msl == 'true':
-            return True
-        return False
+        return self.settings.mark_special_links
 
     def set_mark_special_links(self, value):
-        if value:
-            mark_special_links = 'true'
-        else:
-            mark_special_links = 'false'
-        if self.props.hasProperty('mark_special_links'):
-            self.props.manage_changeProperties(mark_special_links=mark_special_links)
-        else:
-            self.props.manage_addProperty(
-                'mark_special_links', mark_special_links, 'string')
+        self.settings.mark_special_links = value
 
     mark_special_links = property(get_mark_special_links,
                                   set_mark_special_links)