diff --git a/scss/atoms/typography/_typography.scss b/scss/atoms/typography/_typography.scss
index 5d97583..2016aab 100644
--- a/scss/atoms/typography/_typography.scss
+++ b/scss/atoms/typography/_typography.scss
@@ -64,22 +64,22 @@ h6 {
 */
 
 hr {
-	border: 0;
-	border-bottom: 1px solid #999;
+	border: map-get($hr, border);
+	border-bottom: map-get($hr, border-bottom) $hr-border-color;
 }
 
 blockquote {
-	margin: 0;
-	padding-left: 1em;
-	position: relative;
-	border-left: 4px solid #eee; // TODO replace with color variable
-	font-style: italic;
+	margin: map-get($blockquote, margin);
+	padding-left: map-get($blockquote, padding-left);
+	position: map-get($blockquote, position);
+	border-left: map-get($blockquote, border-left) $blockquote-color;
+	font-style: map-get($blockquote, font-style);
 }
 
 pre {
-	padding: 16px 20px;
-	background: #f7f7f7;
-	font: normal 12px/1.4 $monospace;
+	padding: map-get($pre, padding);
+	background: map-get($pre, background);
+	font: map-get($pre, font) $monospace;
 }
 
 /*
@@ -89,11 +89,11 @@ pre {
 */
 
 dt {
-	font-weight: 600;
+	font-weight: $dt-font-weight;
 }
 
 dd {
-	margin: 0;
+	margin: $dd-margin;
 }
 
 /*
@@ -121,8 +121,8 @@ strong {
 }
 
 code {
-	background: #f2f2f2; // TODO replace with color variable
-	font-size: em( 16px );
-	padding: em( 4px, 16px ) em( 8px, 16px );
-	border-radius: 3px;
+	background: $code-background;
+	font-size: map-get($code, font-size);
+	padding: map-get($code, padding);
+	border-radius: map-get($code, border-radius);
 }
diff --git a/scss/variables/colors.js b/scss/variables/colors.js
index 5f7cb5d..5e278ad 100644
--- a/scss/variables/colors.js
+++ b/scss/variables/colors.js
@@ -39,11 +39,7 @@ chassis.colors = {
 	"font": colors[ "chassis-gray-dark" ],
 	"link": colors[ "chassis-blue-dark" ],
 	"button": colors[ "chassis-blue" ],
-	"buttonText": colors[ "chassis-gray-light" ],
-	"blockquoteBorder": {
-		name: "Chassis - Blockquote color",
-		value: "#eee"
-	}
+	"buttonText": colors[ "chassis-gray-light" ]
 };
 return chassis;
 } ) );
diff --git a/scss/variables/typography.js b/scss/variables/typography.js
index 170866b..2d0f703 100644
--- a/scss/variables/typography.js
+++ b/scss/variables/typography.js
@@ -52,7 +52,65 @@ chassis.typography = {
 	sans: {
 		name: "Font Family - Sans",
 		value: "Helvetica, Arial, sans-serif"
-	}
+	},
+	"blockquote-color": {
+		name: "blockquote color",
+		value: "#eee"
+	},
+  "blockquote": {
+    name: "Blockquote",
+    value: {
+      "margin": "0",
+      "padding-left": "1em",
+      "position": "relative",
+      "border-left": "4px solid ",
+      "font-style": "italic"
+    }
+  },
+	"code-background": {
+		name: "Code Background Color",
+		value: "#F2F2F2"
+	},
+  "code": {
+    name: "Code",
+    value: {
+      "background": "$code-background",
+      "font-size": "em( 16px )",
+      "padding": "em( 4px, 16px ) em( 8px, 16px )",
+      "border-radius": "3px"
+    }
+  },
+	"pre-bgcolor": {
+		name: "Pre Background Color",
+		value: "#eee"
+	},
+  "pre": {
+    name: "Pre",
+    value: {
+      "padding": "16px 20px",
+      "background": "$pre-bgcolor",
+      "font": "normal 12px/1.4 "
+    }
+  },
+	"hr-border-color": {
+		name: "Horizontal Rule Border Color",
+		value: "#999"
+	},
+  "hr": {
+    name: "Horizontal Rule",
+    value: {
+      "border": "0",
+      "border-bottom": "1px solid "
+    }
+  },
+  "dt-font-weight": {
+    name: "Description Term Font Weight",
+    value: "600"
+  },
+  "dd-margin": {
+    name: "Description Element Margin",
+    value: "0"
+  }
 };
 
 return chassis;