diff --git a/examples/John_Doe_ClassicTheme_CV.pdf b/examples/John_Doe_ClassicTheme_CV.pdf
index 5a56473..cf7e474 100644
Binary files a/examples/John_Doe_ClassicTheme_CV.pdf and b/examples/John_Doe_ClassicTheme_CV.pdf differ
diff --git a/examples/John_Doe_ClassicTheme_CV.yaml b/examples/John_Doe_ClassicTheme_CV.yaml
index f93139d..532e47b 100644
--- a/examples/John_Doe_ClassicTheme_CV.yaml
+++ b/examples/John_Doe_ClassicTheme_CV.yaml
@@ -26,16 +26,16 @@ cv:
         institution: University of Pennsylvania
         area: Computer Science
         degree: BS
-    employment:
+    experience:
       - start_date: 2004-06
         end_date: 2004-08
         highlights:
-          - Reduced time to render the user's buddy list by 75% by implementing prediction
-            algorithm.
-          - Implemented iChat integration with OS X Spotlight Search by creating tool
-            which extracts metadata from saved chat transcripts and provides metadata
+          - Reduced time to render the user's buddy list by 75% by implementing a
+            prediction algorithm.
+          - Implemented iChat integration with OS X Spotlight Search by creating a
+            tool that extracts metadata from saved chat transcripts and provides metadata
             to a system-wide search database.
-          - Redesigned chat file format and implemented backwards compatibility for
+          - Redesigned chat file format and implemented backward compatibility for
             search.
         location: CA, USA
         company: Apple Computer
@@ -43,9 +43,9 @@ cv:
       - start_date: 2003-09
         end_date: 2005-04
         highlights:
-          - Promoted to Lead Student Ambassador in Fall 2004, supervised 10 - 15 Student
-            Ambassadors.
-          - 'Created and taught Computer Science course, CSE 099: Software Design
+          - Promoted to Lead Student Ambassador in the Fall of 2004, supervised 10
+            - 15 Student Ambassadors.
+          - 'Created and taught a computer science course, CSE 099: Software Design
             and Development.'
         location: WA, USA
         company: Microsoft Corporation
@@ -55,23 +55,21 @@ cv:
         highlights:
           - Implemented a user interface for the VS open file switcher (ctrl-tab)
             and extended it to tool windows.
-          - Created service to provide gradient across VS and VS add-ins. Optimized
+          - Created a service to provide gradient across VS and VS add-ins. Optimized
             service via caching.
           - Programmer Productivity Research Center (Summers 2001, 2002)
-          - 'Built app to compute similarity of all methods in a code base, reduced
+          - 'Built app to compute the similarity of all methods in a code base, reduced
             time from $\mathcal{O}(n^2)$ to $\mathcal{O}(n \log n)$. '
-          - Created test case generation tool which creates random XML docs from XML
-            Schema.
+          - Created a test case generation tool that creates random XML docs from
+            XML Schema.
         location: PA, USA
         company: University of Pennsylvania
         position: Head Teaching Assistant
       - start_date: 2003-06
         end_date: 2003-08
         highlights:
-          - Promoted to Lead Student Ambassador in Fall 2004, supervised 10 - 15 Student
-            Ambassadors.
-          - 'Created and taught Computer Science course, CSE 099: Software Design
-            and Development.'
+          - Promoted to Lead Student Ambassador in the Fall of 2004, supervised 10
+            - 15 Student Ambassadors.
         location: WA, USA
         company: Microsoft Corporation
         position: Software Design Engineer, Intern
@@ -98,19 +96,20 @@ cv:
         highlights:
           - Developed a desktop calendar with globally shared and synchronized calendars,
             allowing users to schedule meetings with other users.
-          - Used C#.NET, SQL and XML.
+          - Used C#.NET, SQL, and XML.
         name: Synchronized Calendar
       - date: '2002'
         highlights:
-          - Developed a UNIX-style OS with scheduler, file system, text editor and
-            calculator.
+          - Developed a UNIX-style OS with a scheduler, file system, text editor,
+            and calculator.
           - Used C.
         name: Operating System
     additional_experience_and_awards:
       - name: Instructor (2003 - 2005)
         details: Taught two full-credit Computer Science courses.
       - name: Third Prize, Senior Design Projects
-        details: Awarded 3rd prize for Synchronized Calendar project, out of 100 projects.
+        details: Awarded 3rd prize for a synchronized calendar project out of 100
+          projects.
     technologies:
       - name: Languages
         details: C++, C, Java, Objective-C, C#.NET, SQL, JavaScript
@@ -148,4 +147,4 @@ design:
       horizontal_between_connections: 0.5 cm
   theme: classic
   show_timespan_in:
-    - Employment
+    - Experience
diff --git a/examples/John_Doe_ModerncvTheme_CV.pdf b/examples/John_Doe_ModerncvTheme_CV.pdf
index 6c246ad..b60707d 100644
Binary files a/examples/John_Doe_ModerncvTheme_CV.pdf and b/examples/John_Doe_ModerncvTheme_CV.pdf differ
diff --git a/examples/John_Doe_ModerncvTheme_CV.yaml b/examples/John_Doe_ModerncvTheme_CV.yaml
index dd8dc91..f3794e0 100644
--- a/examples/John_Doe_ModerncvTheme_CV.yaml
+++ b/examples/John_Doe_ModerncvTheme_CV.yaml
@@ -26,16 +26,16 @@ cv:
         institution: University of Pennsylvania
         area: Computer Science
         degree: BS
-    employment:
+    experience:
       - start_date: 2004-06
         end_date: 2004-08
         highlights:
-          - Reduced time to render the user's buddy list by 75% by implementing prediction
-            algorithm.
-          - Implemented iChat integration with OS X Spotlight Search by creating tool
-            which extracts metadata from saved chat transcripts and provides metadata
+          - Reduced time to render the user's buddy list by 75% by implementing a
+            prediction algorithm.
+          - Implemented iChat integration with OS X Spotlight Search by creating a
+            tool that extracts metadata from saved chat transcripts and provides metadata
             to a system-wide search database.
-          - Redesigned chat file format and implemented backwards compatibility for
+          - Redesigned chat file format and implemented backward compatibility for
             search.
         location: CA, USA
         company: Apple Computer
@@ -43,9 +43,9 @@ cv:
       - start_date: 2003-09
         end_date: 2005-04
         highlights:
-          - Promoted to Lead Student Ambassador in Fall 2004, supervised 10 - 15 Student
-            Ambassadors.
-          - 'Created and taught Computer Science course, CSE 099: Software Design
+          - Promoted to Lead Student Ambassador in the Fall of 2004, supervised 10
+            - 15 Student Ambassadors.
+          - 'Created and taught a computer science course, CSE 099: Software Design
             and Development.'
         location: WA, USA
         company: Microsoft Corporation
@@ -55,23 +55,21 @@ cv:
         highlights:
           - Implemented a user interface for the VS open file switcher (ctrl-tab)
             and extended it to tool windows.
-          - Created service to provide gradient across VS and VS add-ins. Optimized
+          - Created a service to provide gradient across VS and VS add-ins. Optimized
             service via caching.
           - Programmer Productivity Research Center (Summers 2001, 2002)
-          - 'Built app to compute similarity of all methods in a code base, reduced
+          - 'Built app to compute the similarity of all methods in a code base, reduced
             time from $\mathcal{O}(n^2)$ to $\mathcal{O}(n \log n)$. '
-          - Created test case generation tool which creates random XML docs from XML
-            Schema.
+          - Created a test case generation tool that creates random XML docs from
+            XML Schema.
         location: PA, USA
         company: University of Pennsylvania
         position: Head Teaching Assistant
       - start_date: 2003-06
         end_date: 2003-08
         highlights:
-          - Promoted to Lead Student Ambassador in Fall 2004, supervised 10 - 15 Student
-            Ambassadors.
-          - 'Created and taught Computer Science course, CSE 099: Software Design
-            and Development.'
+          - Promoted to Lead Student Ambassador in the Fall of 2004, supervised 10
+            - 15 Student Ambassadors.
         location: WA, USA
         company: Microsoft Corporation
         position: Software Design Engineer, Intern
@@ -98,19 +96,20 @@ cv:
         highlights:
           - Developed a desktop calendar with globally shared and synchronized calendars,
             allowing users to schedule meetings with other users.
-          - Used C#.NET, SQL and XML.
+          - Used C#.NET, SQL, and XML.
         name: Synchronized Calendar
       - date: '2002'
         highlights:
-          - Developed a UNIX-style OS with scheduler, file system, text editor and
-            calculator.
+          - Developed a UNIX-style OS with a scheduler, file system, text editor,
+            and calculator.
           - Used C.
         name: Operating System
     additional_experience_and_awards:
       - name: Instructor (2003 - 2005)
         details: Taught two full-credit Computer Science courses.
       - name: Third Prize, Senior Design Projects
-        details: Awarded 3rd prize for Synchronized Calendar project, out of 100 projects.
+        details: Awarded 3rd prize for a synchronized calendar project out of 100
+          projects.
     technologies:
       - name: Languages
         details: C++, C, Java, Objective-C, C#.NET, SQL, JavaScript
diff --git a/examples/John_Doe_Sb2novTheme_CV.pdf b/examples/John_Doe_Sb2novTheme_CV.pdf
index 6c2498f..937c8b7 100644
Binary files a/examples/John_Doe_Sb2novTheme_CV.pdf and b/examples/John_Doe_Sb2novTheme_CV.pdf differ
diff --git a/examples/John_Doe_Sb2novTheme_CV.yaml b/examples/John_Doe_Sb2novTheme_CV.yaml
index 582eb36..1d8637f 100644
--- a/examples/John_Doe_Sb2novTheme_CV.yaml
+++ b/examples/John_Doe_Sb2novTheme_CV.yaml
@@ -26,16 +26,16 @@ cv:
         institution: University of Pennsylvania
         area: Computer Science
         degree: BS
-    employment:
+    experience:
       - start_date: 2004-06
         end_date: 2004-08
         highlights:
-          - Reduced time to render the user's buddy list by 75% by implementing prediction
-            algorithm.
-          - Implemented iChat integration with OS X Spotlight Search by creating tool
-            which extracts metadata from saved chat transcripts and provides metadata
+          - Reduced time to render the user's buddy list by 75% by implementing a
+            prediction algorithm.
+          - Implemented iChat integration with OS X Spotlight Search by creating a
+            tool that extracts metadata from saved chat transcripts and provides metadata
             to a system-wide search database.
-          - Redesigned chat file format and implemented backwards compatibility for
+          - Redesigned chat file format and implemented backward compatibility for
             search.
         location: CA, USA
         company: Apple Computer
@@ -43,9 +43,9 @@ cv:
       - start_date: 2003-09
         end_date: 2005-04
         highlights:
-          - Promoted to Lead Student Ambassador in Fall 2004, supervised 10 - 15 Student
-            Ambassadors.
-          - 'Created and taught Computer Science course, CSE 099: Software Design
+          - Promoted to Lead Student Ambassador in the Fall of 2004, supervised 10
+            - 15 Student Ambassadors.
+          - 'Created and taught a computer science course, CSE 099: Software Design
             and Development.'
         location: WA, USA
         company: Microsoft Corporation
@@ -55,23 +55,21 @@ cv:
         highlights:
           - Implemented a user interface for the VS open file switcher (ctrl-tab)
             and extended it to tool windows.
-          - Created service to provide gradient across VS and VS add-ins. Optimized
+          - Created a service to provide gradient across VS and VS add-ins. Optimized
             service via caching.
           - Programmer Productivity Research Center (Summers 2001, 2002)
-          - 'Built app to compute similarity of all methods in a code base, reduced
+          - 'Built app to compute the similarity of all methods in a code base, reduced
             time from $\mathcal{O}(n^2)$ to $\mathcal{O}(n \log n)$. '
-          - Created test case generation tool which creates random XML docs from XML
-            Schema.
+          - Created a test case generation tool that creates random XML docs from
+            XML Schema.
         location: PA, USA
         company: University of Pennsylvania
         position: Head Teaching Assistant
       - start_date: 2003-06
         end_date: 2003-08
         highlights:
-          - Promoted to Lead Student Ambassador in Fall 2004, supervised 10 - 15 Student
-            Ambassadors.
-          - 'Created and taught Computer Science course, CSE 099: Software Design
-            and Development.'
+          - Promoted to Lead Student Ambassador in the Fall of 2004, supervised 10
+            - 15 Student Ambassadors.
         location: WA, USA
         company: Microsoft Corporation
         position: Software Design Engineer, Intern
@@ -98,19 +96,20 @@ cv:
         highlights:
           - Developed a desktop calendar with globally shared and synchronized calendars,
             allowing users to schedule meetings with other users.
-          - Used C#.NET, SQL and XML.
+          - Used C#.NET, SQL, and XML.
         name: Synchronized Calendar
       - date: '2002'
         highlights:
-          - Developed a UNIX-style OS with scheduler, file system, text editor and
-            calculator.
+          - Developed a UNIX-style OS with a scheduler, file system, text editor,
+            and calculator.
           - Used C.
         name: Operating System
     additional_experience_and_awards:
       - name: Instructor (2003 - 2005)
         details: Taught two full-credit Computer Science courses.
       - name: Third Prize, Senior Design Projects
-        details: Awarded 3rd prize for Synchronized Calendar project, out of 100 projects.
+        details: Awarded 3rd prize for a synchronized calendar project out of 100
+          projects.
     technologies:
       - name: Languages
         details: C++, C, Java, Objective-C, C#.NET, SQL, JavaScript