diff --git a/partials/doc/section/affiliation.xml b/partials/doc/section/affiliation.xml
new file mode 100644
index 0000000..0ec3b55
--- /dev/null
+++ b/partials/doc/section/affiliation.xml
@@ -0,0 +1,68 @@
+
+
+ {{#> header-affiliation }}
+ {{> header-simple _title="AFFILIATION" _section="affiliation" }}
+ {{/header-affiliation}}
+
+ {{#each r.affiliation.history}}
+
+
+
+
+
+
+
+
+
+
+ {{ role }},
+
+ {{#if url}}{{/if}}
+
+ {{#if url}}
+
+
+
+ {{/if}}
+ {{ organization }}
+
+ {{#if url}}{{/if}}
+
+
+
+
+ {{dateRange . 'MMM YYYY'}}
+
+
+
+
+
+
+
+
+ {{{wpml summary true}}}
+
+
+ {{#each highlights }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{{wpml this true}}}
+
+ {{/each}}
+
+
+
+ {{/each}}
+
+
diff --git a/partials/html/section/affiliation.html b/partials/html/section/affiliation.html
new file mode 100644
index 0000000..5959c3d
--- /dev/null
+++ b/partials/html/section/affiliation.html
@@ -0,0 +1,26 @@
+{{#section "affiliation"}}
+
+
+ {{#> header-affiliation }}
+ {{> header-icon _title="AFFILIATION" _section="affiliation" _hdricon=(lookup . '_icon') }}
+ {{/header-affiliation}}
+
+ {{#each r.affiliation.history}}
+ {{#> body-affiliation }}
+
+
{{ role }},
+ {{#if url }}
+ {{ organization }}
+ {{else}}
+ {{ organization }}
+ {{/if}}
+
+
{{dateRange .}}
+ {{{ summary }}}
+ {{> highlights }}
+ {{#if keywords}}
{{#each keywords}}{{{ . }}} {{/each}}{{/if}}
+
+ {{/body-affiliation}}
+ {{/each}}
+
+{{/section}}
diff --git a/partials/md/section/affiliation.hbs b/partials/md/section/affiliation.hbs
new file mode 100644
index 0000000..b96069d
--- /dev/null
+++ b/partials/md/section/affiliation.hbs
@@ -0,0 +1,19 @@
+{{#section "affiliation"}}
+## {{{sectionTitle "AFFILIATION"}}}
+
+{{#each r.affiliation.history }}
+{{#if url}}
+### *{{{ role }}}*, [{{{ organization }}}]({{{ url }}}) ({{dateRange .}})
+{{else}}
+### *{{{ role }}}*, {{{ organization }}} ({{dateRange .}})
+{{/if}}
+
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+ - {{{ . }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}
diff --git a/partials/txt/section/affiliation.hbs b/partials/txt/section/affiliation.hbs
new file mode 100644
index 0000000..5e4d44d
--- /dev/null
+++ b/partials/txt/section/affiliation.hbs
@@ -0,0 +1,14 @@
+{{#section "affiliation"}}
+{{{sectionTitle "AFFILIATION"}}} --------------------------------------------------------------------
+
+{{#each r.affiliation.history }}
+{{#if role}}{{{ role }}}, {{/if}}{{{ organization }}} ({{dateRange .}})
+{{{ summary }}}
+{{#if highlights}}
+{{#each highlights}}
+- {{{ this }}}
+{{/each}}
+{{/if}}
+
+{{/each}}
+{{/section}}
diff --git a/themes/basis/src/html.html b/themes/basis/src/html.html
index 96a4845..aa3e843 100644
--- a/themes/basis/src/html.html
+++ b/themes/basis/src/html.html
@@ -41,6 +41,8 @@
{{> section/education }}
+{{> section/affiliation }}
+
{{> section/service }}
{{> section/samples }}
diff --git a/themes/basis/src/md.txt b/themes/basis/src/md.txt
index d146690..660cad5 100644
--- a/themes/basis/src/md.txt
+++ b/themes/basis/src/md.txt
@@ -14,6 +14,8 @@
{{> section/education }}
+{{> section/affiliation }}
+
{{> section/samples }}
{{> section/writing }}
diff --git a/themes/basis/src/pdf.html b/themes/basis/src/pdf.html
index 96a4845..aa3e843 100644
--- a/themes/basis/src/pdf.html
+++ b/themes/basis/src/pdf.html
@@ -41,6 +41,8 @@
{{> section/education }}
+{{> section/affiliation }}
+
{{> section/service }}
{{> section/samples }}
diff --git a/themes/basis/src/txt.txt b/themes/basis/src/txt.txt
index 63c8f64..23d0a16 100644
--- a/themes/basis/src/txt.txt
+++ b/themes/basis/src/txt.txt
@@ -14,6 +14,8 @@
{{> section/education }}
+{{> section/affiliation }}
+
{{> section/samples }}
{{> section/writing }}
diff --git a/themes/modern/src/modern-html.html b/themes/modern/src/modern-html.html
index cf1be3c..2a15638 100644
--- a/themes/modern/src/modern-html.html
+++ b/themes/modern/src/modern-html.html
@@ -284,6 +284,7 @@ also doesn't render any content.
{{#*inline "icon-education"}}{{/inline}}
{{#*inline "icon-service"}}{{/inline}}
+{{#*inline "icon-affiliation"}}{{/inline}}
{{#*inline "icon-samples"}}{{/inline}}
{{#*inline "icon-writing"}}{{/inline}}
{{#*inline "icon-reading"}}{{/inline}}
@@ -299,6 +300,7 @@ also doesn't render any content.
{{> section/education _icon="icon-education"}}
{{> section/service _icon="icon-service"}}
+{{> section/affiliation _icon="icon-affiliation"}}
{{> section/samples _icon="icon-samples"}}
{{> section/writing _icon="icon-writing"}}
{{> section/reading _icon="icon-reading"}}