diff --git a/lib/dartdoc.dart b/lib/dartdoc.dart
index bd7836061f..872b28c041 100644
--- a/lib/dartdoc.dart
+++ b/lib/dartdoc.dart
@@ -25,7 +25,7 @@ import 'src/model_utils.dart';
 const String NAME = 'dartdoc';
 
 // Update when pubspec version changes
-const String VERSION = '0.0.1+5';
+const String VERSION = '0.0.1+6';
 
 /// Initialize and setup the generators
 List<Generator> initGenerators(
diff --git a/lib/resources.g.dart b/lib/resources.g.dart
index eaab2561b2..11414d86d9 100644
--- a/lib/resources.g.dart
+++ b/lib/resources.g.dart
@@ -1,4 +1,6 @@
-// WARNING: This file is auto-generated.library resources;
+// WARNING: This file is auto-generated.
+
+library resources;
 
 const List<String> RESOURCE_NAMES = const [
   'package:dartdoc/resources/prettify.css',
diff --git a/lib/src/html_generator.dart b/lib/src/html_generator.dart
index 4988bb90f4..4486e6a75c 100644
--- a/lib/src/html_generator.dart
+++ b/lib/src/html_generator.dart
@@ -65,7 +65,8 @@ class Templates {
       'footer',
       'head',
       'property',
-      'styles_and_scripts'
+      'styles_and_scripts',
+      'readable_writable'
     ];
     for (var partial in partials) {
       _partialTemplates[partial] = await _loadPartial('_$partial.html');
diff --git a/lib/templates/_property.html b/lib/templates/_property.html
index 5e3e48789e..0b862fa1a7 100644
--- a/lib/templates/_property.html
+++ b/lib/templates/_property.html
@@ -3,10 +3,6 @@
     <span class="returntype">{{{ linkedReturnType }}}</span>
 </dt>
 <dd>
-    <div class="readable-writable">
-        {{#readOnly}}read-only{{/readOnly}}
-        {{#writeOnly}}write-only{{/writeOnly}}
-        {{#readWrite}}read/write{{/readWrite}}
-    </div>
+    {{>readable_writable}}
     {{#oneLiner}}{{ documentation }}{{/oneLiner}}
 </dd>
\ No newline at end of file
diff --git a/lib/templates/_readable_writable.html b/lib/templates/_readable_writable.html
new file mode 100644
index 0000000000..f6922c91c1
--- /dev/null
+++ b/lib/templates/_readable_writable.html
@@ -0,0 +1,5 @@
+<div class="readable-writable">
+    {{#readOnly}}read-only{{/readOnly}}
+    {{#writeOnly}}write-only{{/writeOnly}}
+    {{#readWrite}}read/write{{/readWrite}}
+</div>
\ No newline at end of file
diff --git a/lib/templates/property.html b/lib/templates/property.html
index 22546ba837..94f37d2f00 100644
--- a/lib/templates/property.html
+++ b/lib/templates/property.html
@@ -4,14 +4,11 @@
     {{#property}}
       <span class="returntype">{{{ linkedReturnType }}}</span>
       <span class="name">{{ name }}</span>
+
+      {{>readable_writable}}
     {{/property}}
   </section>
 
-  <div>
-    <span class="{{#property.hasGetter}}has-it{{/property.hasGetter}} getter">read</span>
-    <span class="{{#property.hasSetter}}has-it{{/property.hasSetter}} setter">write</span>
-  </div>
-
   <section class="desc markdown">
 
       {{#markdown}}
diff --git a/lib/templates/top_level_property.html b/lib/templates/top_level_property.html
index 22546ba837..94f37d2f00 100644
--- a/lib/templates/top_level_property.html
+++ b/lib/templates/top_level_property.html
@@ -4,14 +4,11 @@
     {{#property}}
       <span class="returntype">{{{ linkedReturnType }}}</span>
       <span class="name">{{ name }}</span>
+
+      {{>readable_writable}}
     {{/property}}
   </section>
 
-  <div>
-    <span class="{{#property.hasGetter}}has-it{{/property.hasGetter}} getter">read</span>
-    <span class="{{#property.hasSetter}}has-it{{/property.hasSetter}} setter">write</span>
-  </div>
-
   <section class="desc markdown">
 
       {{#markdown}}