diff --git a/examples/europasscv/europasscv.pdf b/examples/europasscv/europasscv.pdf
index e193ba5..f2422b6 100644
Binary files a/examples/europasscv/europasscv.pdf and b/examples/europasscv/europasscv.pdf differ
diff --git a/examples/moderncv-green/moderncv-green.pdf b/examples/moderncv-green/moderncv-green.pdf
index e6caa93..630d563 100644
Binary files a/examples/moderncv-green/moderncv-green.pdf and b/examples/moderncv-green/moderncv-green.pdf differ
diff --git a/examples/moderncv-green/moderncv-green.yaml b/examples/moderncv-green/moderncv-green.yaml
index 10a427a..6bcd847 100644
--- a/examples/moderncv-green/moderncv-green.yaml
+++ b/examples/moderncv-green/moderncv-green.yaml
@@ -8,7 +8,6 @@ mobile: 0123456789
 email: john.doe@domain.com
 theme:
   color: green
-  style: classic
 cron-sections:
   - section: Job
     entries:
diff --git a/examples/moderncv-orange-casual/moderncv-orange-casual.pdf b/examples/moderncv-orange-casual/moderncv-orange-casual.pdf
new file mode 100644
index 0000000..d1b346b
Binary files /dev/null and b/examples/moderncv-orange-casual/moderncv-orange-casual.pdf differ
diff --git a/examples/moderncv-orange-casual/moderncv-orange-casual.yaml b/examples/moderncv-orange-casual/moderncv-orange-casual.yaml
new file mode 100644
index 0000000..e1f0a08
--- /dev/null
+++ b/examples/moderncv-orange-casual/moderncv-orange-casual.yaml
@@ -0,0 +1,47 @@
+---
+name:
+  first: John
+  family: Doe
+address:
+  first: street and number
+mobile: 0123456789
+email: john.doe@domain.com
+theme:
+  style: casual
+  color: orange
+cron-sections:
+  - section: Job
+    entries:
+      - year: 2018--2020
+        degree: Job Title
+        institution: Institution
+        city: City
+        grade: Grade
+  - section: Education
+    entries:
+      - year: 2015--2018
+        degree: Degree
+        institution: Institution
+        city: City
+        grade: Grade
+        description: Insert here the description
+      - year: 2010--2015
+        degree: Degree
+        institution: Institution
+        city: City
+        grade: Grade
+        description: Insert here the description
+sections:
+  - section: Languages
+    items:
+      - left: English 
+        right: Good
+  - section: Skills
+    items:
+      - left: Category 1
+        right: xxx, yyy, zzz
+      - left: Category 2
+        right: xxx, yyy, zzz
+      - left: Category 3
+        right: xxx, yyy, zzz
+---
diff --git a/examples/moderncv/moderncv.pdf b/examples/moderncv/moderncv.pdf
index 9c5eb72..de54761 100644
Binary files a/examples/moderncv/moderncv.pdf and b/examples/moderncv/moderncv.pdf differ
diff --git a/pancv.tex b/pancv.tex
index 70fe9bd..c0bf1e4 100644
--- a/pancv.tex
+++ b/pancv.tex
@@ -1,86 +1,85 @@
+$if(europass)$
 \newcommand{\pancvname}[2]{
-  $if(europass)$
   \ecvname{#1 #2}
-  $else$
-  \firstname{#1}
-  \familyname{#2}
-  $endif$
 }
 
 \newcommand{\pancvphone}[1]{
-  $if(europass)$
   \ecvtelephone{#1}
-  $else$
-  \phone{#1}
-  $endif$
 }
 
 \newcommand{\pancvmobile}[1]{
-  $if(europass)$
   \ecvmobile{#1}
-  $else$
-  \mobile{#1}
-  $endif$
 }
 
 \newcommand{\pancvemail}[1]{
-  $if(europass)$
   \ecvemail{#1}
-  $else$
-  \email{#1}
-  $endif$
 }
 
 \newcommand{\pancvaddress}[2]{
-  $if(europass)$
   \ecvaddress{#1, #2}
-  $else$
-  \address{#1}{#2}
-  $endif$
 }
 
 \newcommand{\pancvsection}[1]{
-  $if(europass)$
   \ecvsection{#1}
-  $else$
-  \section{#1}
-  $endif$
 }
 
 \newcommand{\pancventry}[6]{
-  $if(europass)$
   \ecvitem{#1}{
     \textbf{#2},
     #3.
     \ifthenelse{\isempty{#4}}{}{#4}
     \ifthenelse{\isempty{#5}}{}{#5.}
     \ifthenelse{\isempty{#6}}{}{\newline #6}}
-  $else$
-  \cventry{#1}{#2}{#3}{#4}{#5}{#6}
-  $endif$
 }
 
 \newcommand{\pancvitem}[2]{
-  $if(europass)$
   \ecvitem{#1}{#2}
-  $else$
-  \cvline{#1}{#2}
-  $endif$
 }
+$else$
+\newcommand{\pancvname}[2]{
+  \firstname{#1}
+  \familyname{#2}
+}
+
+\newcommand{\pancvphone}[1]{
+  \phone{#1}
+}
+
+\newcommand{\pancvmobile}[1]{
+  \mobile{#1}
+}
+
+\newcommand{\pancvemail}[1]{
+  \email{#1}
+}
+
+\newcommand{\pancvaddress}[2]{
+  \address{#1}{#2}
+}
+
+\newcommand{\pancvsection}[1]{
+  \section{#1}
+}
+
+\newcommand{\pancventry}[6]{
+  \cventry{#1}{#2}{#3}{#4}{#5}{#6}
+}
+
+\newcommand{\pancvitem}[2]{
+  \cvline{#1}{#2}
+}
+$endif$
 
 $if(europass)$
 \documentclass{europasscv}
-$else$
-\documentclass{moderncv}
-  $if(theme)$
-  \moderncvtheme[$theme.color$]{$theme.style$}
-  $else$
-  \moderncvtheme[blue]{classic}
-  $endif$
-$endif$
 
 \usepackage{xifthen}
 
+$else$
+\documentclass{moderncv}
+\moderncvtheme[$if(theme.color)$$theme.color$$else$blue$endif$]{$if(theme.style)$$theme.style$$else$classic$endif$}
+$endif$
+
 $if(name)$
 \pancvname{$name.first$}{$name.family$}
 $endif$