diff --git a/package.json b/package.json
index 83c3664..994e5c6 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   },
   "homepage": "https://github.com/fluentdesk/fluentcv",
   "dependencies": {
-    "fluent-themes": "0.1.0-beta",
+    "fluent-themes": "0.2.0-beta",
     "fs-extra": "^0.24.0",
     "html": "0.0.10",
     "is-my-json-valid": "^2.12.2",
diff --git a/src/core/fluent-date.js b/src/core/fluent-date.js
index 8deaa48..df57d72 100644
--- a/src/core/fluent-date.js
+++ b/src/core/fluent-date.js
@@ -28,7 +28,7 @@ function FluentDate( dt ) {
 FluentDate/*.prototype*/.fmt = function( dt ) {
   if( (typeof dt === 'string' || dt instanceof String) ) {
     dt = dt.toLowerCase().trim();
-    if( /^(present|now)$/.test(dt) ) { // "Present", "Now"
+    if( /^(present|now|current)$/.test(dt) ) { // "Present", "Now"
       return moment();
     }
     else if( /^\D+\s+\d{4}$/.test(dt) ) { // "Mar 2015"
@@ -40,7 +40,7 @@ FluentDate/*.prototype*/.fmt = function( dt ) {
     else if( /^\d{4}-\d{1,2}$/.test(dt) ) { // "2015-03", "1998-4"
       return moment( dt, 'YYYY-MM' );
     }
-    else if( /^\s\d{4}$/.test(dt) ) { // "2015"
+    else if( /^\s*\d{4}\s*$/.test(dt) ) { // "2015"
       return moment( dt, 'YYYY' );
     }
     else if( /^\s*$/.test(dt) ) { // "", " "
diff --git a/src/gen/template-generator.js b/src/gen/template-generator.js
index 5391183..d9a7833 100644
--- a/src/gen/template-generator.js
+++ b/src/gen/template-generator.js
@@ -35,7 +35,7 @@ var _defaultOpts = {
   },
   prettify: { // ← See https://github.com/beautify-web/js-beautify#options
     indent_size: 2,
-    unformatted: ['em','strong'],
+    unformatted: ['em','strong','a'],
     max_char: 80, // ← See lib/html.js in above-linked repo
     //wrap_line_length: 120, <-- Don't use this
   }