diff --git a/cv.md b/cv.md
new file mode 100644
index 0000000..1de3caa
--- /dev/null
+++ b/cv.md
@@ -0,0 +1,208 @@
+---
+title: Curriculum Vitae
+menu: CV
+class: post
+---
+
+# CURRICULUM VITÆ
+## Miloš Jovanović
+jovanovic at mmg dot mpg dot de
+
+[download as pdf](cv.pdf)
+
+
+### Research interests
+*Urban History, Capitalism, Marxism, Habsburg History, Ottoman History,
+Eastern Europe, Balkans*
+
+### Education
+
+**2016** **Ph.D. in History**  
+  
+*University of Illinois*, Urbana-Champaign, IL (USA)
+
+**2008** **M.A. in History**  
+  
+*Central European University*, Budapest (Hungary)
+
+**2007** **B.A. in History and International Affairs**  
+  
+*Lafayette College*, Easton, PA (USA)
+
+### Professional Experience
+
+**2016-18**
+#### Research Fellow (Project member of Empires of Memory: The cultural
+politics of historicity in former Habsburg and Ottoman Cities)
+_Max Planck Institute for the Study of Ethnic and Religious Diversity_
+Göttingen
+
+**2015-16**
+#### Lecturer (Urban History)
+_University of Illinois_
+Urbana-Champaign
+
+**2011-12**
+#### Instructor (Global Studies)
+_University of Illinois_
+Urbana-Champaign
+
+**2010-12**
+#### Teaching Assistant (Western Civilization)
+_University of Illinois_
+Urbana-Champaign
+
+### Publications
+**2018**
+
+"Whitewashed Empire: Historical Narrative and Place Marketing in Vienna" _History & Anthropology_
+forthcoming
+
+**2017**
+
+"Tianjin's Imperial Discomfort" _Max Planck Institute Blog_
+http://www.mmg.mpg.de/online-media/blogs/2017/jovanovic-tianjins-imperial-discomfort/
+
+**2013**
+
+"The City in Our Hands: Urban Management and Contested Modernity in
+Nineteenth Century Belgrade" _Urban History_
+Vol. 40 No. 1 pp. 32-50
+
+**2009**
+
+"Taming the Tavern: Social Space and Government Regulation in 19th
+Century Belgrade" _Godišnjak za društvenu istoriju - Annual for Social History_
+Year XVI Vol. 3 pp. 57-68
+
+
+### Awards, Grants and Fellowships
+
+**2015** 
+Illinois Program for Research in the Humanities
+Graduate Fellow
+
+**2013** 
+Social Science Research Council
+International Dissertation Research Fellowship
+
+**2013** 
+American Research Center in Sofia
+Research Fellow
+
+**2012** 
+University of Illinois at Urbana-Champaign
+Mary Jane Luecker Graduate Fellow
+
+**2010** 
+University of Illinois at Urbana-Champaign
+Summer Dissertation Proposal Grant
+
+**2008** 
+European University Institute
+Marc Bloch Prize in Early Modern and Modern European History
+
+**2008** 
+Central European University
+Academic Pro-Rectors Excellence Award
+
+### Presentations and Lectures
+
+**2017**
+Bourgeois World-Building in the Balkan City
+Urban World-Making Conference, ASCA City Project, University of
+Amsterdan
+
+**2017**
+Whitewashed Empire: Historical Narrative and Place Marketing in Vienna
+Association for the Study of Nationalities Conference, New York
+
+**2016**
+Excavating the archive: Non-normative histories and heterodox linkages
+in the Balkan city
+Thinking Gender and Sexuality After Empire and Socialism Conference,
+Göttingen
+
+**2015**
+Cities of Dust and Mud: Loss and Dispossession in Belgrade and Sofia
+(1830-1912)
+Places of Amnesia, CRASSH, University of Cambridge
+
+**2015**
+Modernizing Belgrade and Sofia: The Experience of Reconstruction in the
+Balkans (1830-1912)
+Institut d'ethnologie méditerranéenne, européenne et comparative.
+Aix-en-Provence
+
+**2012**
+Empire, military and modern urbanism in Habsburg Sarajevo and Russian
+Sofia (1878-9)
+European Association for Urban History Conference, Prague
+
+**2012**
+The lifeworlds of masons and butchers in the City Beautiful
+European Society for the History of Human Sciences Conference, Belgrade
+
+**2008**
+Urban Reconstruction in Late Ottoman Belgrade: De-Ottomanization and
+Questioning Cosmopolitanism
+Living Together: Plurality and Cosmopolitanism in the Ottoman Empire and
+Beyond Summer Academy, Istanbul
+
+## Community Activities
+
+**2014**
+
+Urban Agriculture and Political Ecology – A Historical Perspective
+Petnica Science Center, Valjevo
+
+**2013**
+
+Urban and/or Bourgeois History? The Study of Balkan City Life as
+Critique
+Social Center Haspel, Sofia
+
+**2012**
+
+Intro to Urban Studies - Weeklong public course employing self-education
+and critical pedagogy methods
+Kabinet Social Center, Belgrade
+
+**2011**
+
+Belgrade Chronicle Television Interview by Nataša Ristić
+Radio Television of Serbia, Channel 1
+
+**2011**
+
+Teheran in My Vehicle: Historical Memory, Urban Development and
+Socially-Responsible Public Transportation
+Mikser Public Festival, Belgrade
+
+**2011**
+
+Open Urbanism Manifesto, author
+Imamo Plan activist group, Belgrade
+
+### Languages
+
+Bosnian-Serbian-Croatian-Montenegrin
+_native_
+
+Bulgarian
+_fluent_
+
+German
+_research_
+
+Spanish
+_research_
+
+Italian
+_research_
+
+Russian
+_can read with dictionary_
+
+Turkish
+_can read with dictionary_
diff --git a/details.yml b/details.yml
index a8e8c04..e754a05 100644
--- a/details.yml
+++ b/details.yml
@@ -1,54 +1,164 @@
 ---
 # Personal details
-name: Friedrich Nietzsche
+name: Miloš Jovanović
 address:
-- Humboldtstraße 36
-- 99425 Weimar
-- Prussia
-phone: "+49 03643 545400"
-email: friedrich@thevoid.de
+- Dürrstraße 3
+- 37083 Göttingen
+- Germany
+phone: 
+- "+49 176 21476704"
+- "+381 65 9476968"
+email: jovanovic@mmg.mpg.de
 # Insert URLs without http://
 urls:
-- wki.pe/friedrich_nietzsche
-- twitter.com/tinynietzsche
+    #- loshmi.net
 
 # Sections
 
-intro: "I know my fate. One day my name will be associated with the memory of something tremendous --- a crisis without equal on earth, the most profound collision of conscience, a decision that was conjured up against everything that had been believed, demanded, hallowed so far. I am no man, I am dynamite."
+intro: "My present project, 'Empires on the Danube: Historicity and Urbanism in Belgrade, Budapest, Ruse, and Vienna' highlights the common structural forces and tensions of urban erasure, capitalism and the production of historicist space on the banks of the Danube. I explore how Habsburg and Ottoman imperial histories intersect with contemporary articulations of 'historical urban space' through market competitiveness, place marketing, and discourses of Europeanness."
 
-skills:
-- Aesthetics, Ethics, Metaphysics, Nihilism
-- Psychology, Ontology, Poetry, Value theory
-- Voluntarism, Tragedy, Fact–value distinction
-- Anti-foundationalism, Philosophy of history
+interests:
+  - Urban History, Capitalism, Marxism, Habsburg History, Ottoman History, Eastern Europe, Balkans
+
+education:
+- year: 2016
+  subject: Ph.D. in History
+  institute: University of Illinois
+  city: Urbana-Champaign, IL (USA)
+- year: 2008
+  subject: M.A. in History
+  institute: Central European University
+  city: Budapest (Hungary)
+- year: 2007
+  subject: B.A. in History and International Affairs
+  institute: Lafayette College
+  city: Easton, PA (USA)
 
 experience:
-- years: 1879--1889
-  employer: Freiberufler
-  job: Freier Philisoph
-  city: Sils-Maria
-- years: 1869–-1879
-  employer: Universität Basel
-  job: Professor für klassische Philologie
-  city: Basel
-- years: 1867--1868
-  employer: Preußischen Artillerie
-  job: Kanonier
-  city: Naumburg
+- years: 2016-18
+  employer: Max Planck Institute for the Study of Ethnic and Religious Diversity
+  job: "Research Fellow (Project member of Empires of Memory: The cultural politics of historicity in former Habsburg and Ottoman Cities)"
+  city: Göttingen
+- years: 2015-16
+  employer: University of Illinois
+  job: Lecturer (Urban History)
+  city: Urbana-Champaign
+- years: 2011-12
+  employer: University of Illinois
+  job: Instructor (Global Studies)
+  city: Urbana-Champaign
+- years: 2010-12
+  employer: University of Illinois
+  job: Teaching Assistant (Western Civilization)
+  city: Urbana-Champaign
 
-education:
-- year: 1867
-  subject: Philology
-  institute: Leipzig Universität
-  city: Leipzig
-- year: 1864
-  subject: Abitur
-  institute: Schulpforta
-  city: Naumburg
+publications:
+- year: 2018
+  title: "Whitewashed Empire: Historical Narrative and Place Marketing in Vienna"
+  publication: History & Anthropology
+  details: forthcoming
+- year: 2017
+  title: "Tianjin's Imperial Discomfort"
+  publication: Max Planck Institute Blog
+  details: http://www.mmg.mpg.de/online-media/blogs/2017/jovanovic-tianjins-imperial-discomfort/
+- year: 2013
+  title: "The City in Our Hands: Urban Management and Contested Modernity in Nineteenth Century Belgrade"
+  publication: Urban History
+  details: Vol. 40 No. 1 pp. 32-50
+- year: 2009
+  title: "Taming the Tavern: Social Space and Government Regulation in 19th Century Belgrade"
+  publication: "Godišnjak za društvenu istoriju - Annual for Social History"
+  details: Year XVI Vol. 3 pp. 57-68
+
+awards:
+- year: 2015
+  title: Illinois Program for Research in the Humanities
+  details: Graduate Fellow 
+- year: 2013
+  title: Social Science Research Council
+  details: International Dissertation Research Fellowship
+- year: 2013
+  title: American Research Center in Sofia
+  details: Research Fellow
+- year: 2012
+  title: University of Illinois at Urbana-Champaign
+  details:  Mary Jane Luecker Graduate Fellow
+- year: 2010
+  title: University of Illinois at Urbana-Champaign
+  details: Summer Dissertation Proposal Grant
+- year: 2008
+  title: European University Institute
+  details: Marc Bloch Prize in Early Modern and Modern European History
+- year: 2008
+  title: Central European University
+  details: Academic Pro-Rectors Excellence Award
+
+talks:
+- year: 2017
+  title: "Bourgeois World-Building in the Balkan City" 
+  details: Urban World-Making Conference, ASCA City Project, University of Amsterdan
+- year: 2017
+  title: "Whitewashed Empire: Historical Narrative and Place Marketing in Vienna"
+  details: Association for the Study of Nationalities Conference, New York
+- year: 2016
+  title: "Excavating the archive: Non-normative histories and heterodox linkages in the Balkan city"
+  details: Thinking Gender and Sexuality After Empire and Socialism Conference, Göttingen
+- year: 2015
+  title:  "Cities of Dust and Mud: Loss and Dispossession in Belgrade and Sofia (1830-1912)"
+  details: Places of Amnesia, CRASSH, University of Cambridge
+- year: 2015
+  title: "Modernizing Belgrade and Sofia: The Experience of Reconstruction in the Balkans (1830-1912)"
+  details: Institut d'ethnologie méditerranéenne, européenne et comparative. Aix-en-Provence
+- year: 2012
+  title: "Empire, military and modern urbanism in Habsburg Sarajevo and Russian Sofia (1878-9)"
+  details: European Association for Urban History Conference, Prague
+- year: 2012
+  title: "The lifeworlds of masons and butchers in the City Beautiful"
+  details: European Society for the History of Human Sciences Conference, Belgrade
+- year: 2008
+  title: "Urban Reconstruction in Late Ottoman Belgrade: De-Ottomanization and Questioning Cosmopolitanism"
+  details: "Living Together: Plurality and Cosmopolitanism in the Ottoman Empire and Beyond Summer Academy, Istanbul"
 
+community:
+- year: 2014
+  activity: "Urban Agriculture and Political Ecology – A Historical Perspective"
+  details: Petnica Science Center, Valjevo
+- year: 2013
+  activity: "Urban and/or Bourgeois History? The Study of Balkan City Life as Critique" 
+  details: Social Center Haspel, Sofia
+- year: 2012
+  activity: "Intro to Urban Studies - Weeklong public course employing self-education and critical pedagogy methods"
+  details: Kabinet Social Center, Belgrade
+- year: 2011
+  activity: Belgrade Chronicle Television Interview by Nataša Ristić
+  details: Radio Television of Serbia, Channel 1
+- year: 2011
+  activity: "Teheran in My Vehicle: Historical Memory, Urban Development and Socially-Responsible Public Transportation"
+  details: Mikser Public Festival, Belgrade
+- year: 2011
+  activity: "Open Urbanism Manifesto, author"
+  details: Imamo Plan activist group, Belgrade
+  
+  
+languages:
+-    language: Bosnian-Serbian-Croatian-Montenegrin
+     proficiency: native
+-    language: Bulgarian
+     proficiency: fluent
+-    language: German
+     proficiency: research
+-    language: Spanish
+     proficiency: research
+-    language: Italian
+     proficiency: research
+-    language: Russian
+     proficiency: can read with dictionary
+-    language: Turkish
+     proficiency: can read with dictionary
+    
 # Settings
-mainfont: Hoefler Text
-fontsize: 10pt
+mainfont: Linux Libertine O
+fontsize: 12pt
 lang: English
 geometry: a4paper, left=35mm, right=35mm, top=51mm, bottom=17mm
 ---
diff --git a/makefile b/makefile
index f5ed9b4..8798961 100644
--- a/makefile
+++ b/makefile
@@ -1,6 +1,6 @@
 TEX = pandoc
 src = template.tex details.yml
-FLAGS = --pdf-engine=xelatex
+FLAGS = --latex-engine=xelatex
 
 output.pdf : $(src)
 	$(TEX) $(filter-out $<,$^ ) -o $@ --template=$< $(FLAGS)
diff --git a/output.pdf b/output.pdf
index 38713ca..4356f28 100644
Binary files a/output.pdf and b/output.pdf differ
diff --git a/template.markdown b/template.markdown
new file mode 100644
index 0000000..3385bef
--- /dev/null
+++ b/template.markdown
@@ -0,0 +1,89 @@
+---
+title: Curriculum Vitae
+menu: CV
+class: post
+---
+
+# CURRICULUM VITÆ
+## Miloš Jovanović
+jovanovic at mmg dot mpg dot de
+
+[download as pdf](cv.pdf)
+
+
+$if(interests)$
+### Research interests
+$for(interests)$
+*$interests$*
+$endfor$
+$endif$
+
+$if(education)$
+### Education
+$for(education)$
+
+**$education.year$** **$education.subject$**  
+$if(education.degree)$, $education.degree$$endif$  
+*$education.institute$*$if(education.city)$, $education.city$$endif$
+$endfor$
+$endif$
+
+### Professional Experience
+$for(experience)$
+
+**$experience.years$**
+#### $experience.job$
+_$experience.employer$_
+$experience.city$
+$endfor$
+
+$if(publications)$
+### Publications
+$for(publications)$
+**$publications.year$**
+
+"$publications.title$" _$publications.publication$_
+$publications.details$
+
+$endfor$
+$endif$
+
+$if(awards)$
+### Awards, Grants and Fellowships
+$for(awards)$
+
+**$awards.year$** 
+$awards.title$
+$awards.details$
+$endfor$
+$endif$
+
+$if(talks)$
+### Presentations and Lectures
+$for(talks)$
+
+**$talks.year$**
+$talks.title$
+$talks.details$
+$endfor$
+$endif$
+
+$if(community)$
+## Community Activities
+$for(community)$
+
+**$community.year$**
+
+$community.activity$
+$community.details$
+$endfor$
+$endif$
+
+$if(languages)$
+### Languages
+$for(languages)$
+
+$languages.language$
+_$languages.proficiency$_
+$endfor$
+$endif$
diff --git a/template.tex b/template.tex
index 241e94d..ad7a566 100644
--- a/template.tex
+++ b/template.tex
@@ -64,10 +64,10 @@ $endif$
   pdftitle={$name$'s CV},
   colorlinks, breaklinks, xetex, bookmarks,
   filecolor=black,
-  urlcolor=[rgb]{0.117,0.682,0.858},
-  linkcolor=[rgb]{0.117,0.682,0.858},
-  linkcolor=[rgb]{0.117,0.682,0.858},
-  citecolor=[rgb]{0.117,0.682,0.858}
+  urlcolor=[rgb]{0.191,0.14,0.17},
+  linkcolor=[rgb]{0.191,0.14,0.17},
+  linkcolor=[rgb]{0.191,0.14,0.17},
+  citecolor=[rgb]{0.191,0.14,0.17}
 }
 
 % DOCUMENT
@@ -86,7 +86,9 @@ $endfor$
 
 \vspace{-10pt}
 
-$phone$\\
+    $for(phone)$
+    $phone$\\
+    $endfor$
 \href{mailto:$email$}{$email$}\\
 
 
@@ -99,26 +101,35 @@ $endfor$
 \end{multicols}
 $endif$
 
-\vspace{30pt}
+\vspace{20pt}
 
 $if(intro)$
 $intro$
 $endif$
 
-\subsection*{Areas of Interest}
-$if(skills)$
+\subsection*{Research Interests}
+$if(interests)$
 \begin{itemize}
-    $for(skills)$
-      \item $skills$
+    $for(interests)$
+      \item $interests$
     $endfor$
 \end{itemize}
 $endif$
 
 % \vfill
 
-\vspace{25pt}
+\vspace{20pt}
+
+$if(education)$
+\section*{Education}
+\noindent
+$for(education)$
+\note{$education.year$}\textbf{$education.subject$}$if(education.degree)$, $education.degree$$endif$\\
+\emph{$education.institute$}$if(education.city)$, $education.city$$endif$\\[.2cm]
+$endfor$
+$endif$
 
-\section*{Previous Experience}
+\section*{Professional Experience}
 \noindent
 $for(experience)$
 \note{$experience.years$}\textsc{$experience.employer$}\\
@@ -126,12 +137,40 @@ $for(experience)$
 $experience.city$\\[.2cm]
 $endfor$
 
-$if(education)$
-\section*{Education}
+$if(publications)$
+\section*{Publications}
 \noindent
-$for(education)$
-\note{$education.year$}\textbf{$education.subject$}$if(education.degree)$, $education.degree$$endif$\\
-\emph{$education.institute$}$if(education.city)$, $education.city$$endif$\\[.2cm]
+$for(publications)$
+\note{$publications.year$}\textsc{$publications.title$}\\
+\emph {$publications.publication$}\\
+$publications.details$\\[.2cm]
+$endfor$
+$endif$
+
+$if(awards)$
+\section*{Awards, Grants and Fellowships}
+\noindent
+$for(awards)$
+\note{$awards.year$}\textsc{$awards.title$}\\
+{$awards.details$}\\[.2cm]
+$endfor$
+$endif$
+
+$if(talks)$
+\section*{Presentations and Lectures}
+\noindent
+$for(talks)$
+\note{$talks.year$}\textsc{$talks.title$}\\
+\emph {$talks.details$}\\
+$endfor$
+$endif$
+
+$if(community)$
+\section*{Community Activities}
+\noindent
+$for(community)$
+\note{$community.year$}\textsc{$community.activity$}\\
+\emph {$community.details$}\\
 $endfor$
 $endif$
 
diff --git a/test.md b/test.md
new file mode 100644
index 0000000..4eed4f3
--- /dev/null
+++ b/test.md
@@ -0,0 +1,12 @@
+---
+title: Curriculum Vitae
+class: post
+---
+
+# Miloš Jovanović
+## CURRICULUM VITÆ
+
+Dürrstraße 3
+37083 Göttingen
+Germany
+
diff --git a/upload_cv.sh b/upload_cv.sh
new file mode 100755
index 0000000..21d59c4
--- /dev/null
+++ b/upload_cv.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+rm cv.md
+pandoc --template=template.markdown -o cv.md details.yml
+
+scp -q cv.md root@loshmi.net:/var/www/html/user/pages/04.cv/page.en.md