diff --git a/README.md b/README.md
index 7917aad..70d9dfb 100644
--- a/README.md
+++ b/README.md
@@ -107,6 +107,7 @@ t:
   page: "Page"
   of: "of"
   min_read: "min read"
+  present: "Present"
 ```
 
 ### Navigation
diff --git a/_data/theme.yml b/_data/theme.yml
index f31af9f..89242ea 100644
--- a/_data/theme.yml
+++ b/_data/theme.yml
@@ -18,6 +18,7 @@ t:
   page: "Page"
   of: "of"
   min_read: "min read"
+  present: "Present"
 
 # Google Fonts
 google_fonts:
diff --git a/_includes/cv/education.html b/_includes/cv/education.html
index e598cca..df56572 100644
--- a/_includes/cv/education.html
+++ b/_includes/cv/education.html
@@ -13,10 +13,10 @@
           {% if e.startDate %}
             <span class="startDate">{{ e.startDate }}</span>
           {% endif %}
-          {% if e.endDate %}
-            <span class="endDate">{{ e.endDate | prepend: ' &mdash; ' }}</span>
+          {% if e.endDate == '' %}
+            <span class="endDate">{{ site.data.theme.t.present | default: 'Present' | prepend: ' &mdash; ' }}</span>
           {% else %}
-            <span class="endDate">{{ Present | prepend: ' &mdash; ' }}</span>
+            <span class="endDate">{{ e.endDate | prepend: ' &mdash; ' }}</span>
           {% endif %}
         </div>
         {% if e.area %}
@@ -33,4 +33,4 @@
       {% endfor %}
     </div>
   </div>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/_includes/cv/volunteer.html b/_includes/cv/volunteer.html
index f73973c..5a2d030 100644
--- a/_includes/cv/volunteer.html
+++ b/_includes/cv/volunteer.html
@@ -22,10 +22,10 @@
           {% if v.startDate %}
             <span class="startDate">{{ v.startDate }}</span>
           {% endif %}
-          {% if v.endDate %}
-            <span class="endDate">{{ v.endDate | prepend: ' &mdash; ' }}</span>
+          {% if v.endDate == '' %}
+            <span class="endDate">{{ site.data.theme.t.present | default: 'Present' | prepend: ' &mdash; ' }}</span>
           {% else %}
-            <span class="endDate">{{ Present | prepend: ' &mdash; ' }}</span>
+            <span class="endDate">{{ v.endDate | prepend: ' &mdash; ' }}</span>
           {% endif %}
         </div>
         {% if v.summary %}
@@ -43,4 +43,4 @@
       {% endfor %}
     </div>
   </div>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/_includes/cv/work.html b/_includes/cv/work.html
index e4cfbc7..cffb968 100644
--- a/_includes/cv/work.html
+++ b/_includes/cv/work.html
@@ -22,10 +22,10 @@
           {% if w.startDate %}
             <span class="startDate">{{ w.startDate }}</span>
           {% endif %}
-          {% if w.endDate %}
-            <span class="endDate">{{ w.endDate | prepend: ' &mdash; ' }}</span>
+          {% if w.endDate == '' %}
+            <span class="endDate">{{ site.data.theme.t.present | default: 'Present' | prepend: ' &mdash; ' }}</span>
           {% else %}
-            <span class="endDate">{{ Present | ' &mdash; ' }}</span>
+            <span class="endDate">{{ w.endDate | prepend: ' &mdash; ' }}</span>
           {% endif %}
         </div>
         {% if w.summary %}
@@ -43,4 +43,4 @@
       {% endfor %}
     </div>
   </div>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/example/_data/theme.yml b/example/_data/theme.yml
index f31af9f..89242ea 100644
--- a/example/_data/theme.yml
+++ b/example/_data/theme.yml
@@ -18,6 +18,7 @@ t:
   page: "Page"
   of: "of"
   min_read: "min read"
+  present: "Present"
 
 # Google Fonts
 google_fonts: