diff --git a/bower.json b/bower.json
index 54b9d50..9ecc7f5 100644
--- a/bower.json
+++ b/bower.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "polymer": "Polymer/polymer#^0.5.2",
     "core-elements": "Polymer/core-elements#^0.5.2",
-    "prettify-element": "Polymer/prettify-element3^0.5.2",
+    "prettify-element": "SmokyBob/prettify-element#master",
     "paper-button": "Polymer/paper-button#~0.5.2",
     "paper-dropdown-menu": "Polymer/paper-dropdown-menu#~0.5.2",
     "paper-dropdown": "Polymer/paper-dropdown#~0.5.2",
diff --git a/index.html b/index.html
index 8536364..4235731 100644
--- a/index.html
+++ b/index.html
@@ -26,14 +26,14 @@
     </div>
     <div layout horizontal flex>
       <!--Language selection hidden as now the lang class id difficult to set on the prettify-element-->
-      <paper-dropdown-menu id="pdmLanguage" label="Select Language" style="display:none"
+      <paper-dropdown-menu id="pdmLanguage" label="Select Language"
           on-core-select="{{languageSelected}}">
         <paper-dropdown id="lang" class="dropdown">
             <core-menu class="menu" >
                 <paper-item data-value="--">(auto detect language)</paper-item>
-                <paper-item data-value="c++">c++</paper-item>
+                <paper-item data-value="cpp">c++</paper-item>
                 <paper-item data-value="java">java</paper-item>
-                <paper-item data-value="javascript">javascript</paper-item>
+                <paper-item data-value="js">javascript</paper-item>
                 <paper-item data-value="xml">xml</paper-item>
                 <paper-item data-value="html">html</paper-item>
                 <paper-item data-value="css">css</paper-item>
@@ -49,7 +49,7 @@
     </paper-autogrow-textarea>
     <div id="slidesWarnings">
     </div>
-    <prettify-element id="destination" text="{{code}}" on-tap="{{selPrettyCode}}"></prettify-element>
+    <prettify-element id="destination" text="{{code}}" language="{{language}}" on-tap="{{selPrettyCode}}"></prettify-element>
   </template>
 
   <script src="main.js"></script>
diff --git a/main.js b/main.js
index c4a0f94..86b780a 100644
--- a/main.js
+++ b/main.js
@@ -2,8 +2,8 @@
 var mainContent = document.querySelector('#mainContent');
 
 //Get data from the syncStorage
-chrome.storage.sync.get(["lang","theCode","theme","fontPt"],function(localStorage){
-  mainContent.lang = localStorage.lang || '--';
+chrome.storage.sync.get(["language","theCode","theme","fontPt"],function(localStorage){
+  mainContent.language = localStorage.language || '--';
   mainContent.code = localStorage.theCode || '';
   mainContent.theme = localStorage.theme || 'light';
   mainContent.fontPt = localStorage.fontPt || 14;
@@ -32,7 +32,7 @@ mainContent.addEventListener('template-bound', function(){
   //Find the label of the selected language to set it on the paper-dropdown-menu
   var mnItems =document.querySelectorAll('paper-item');
   [].some.call(mnItems, function(mnItem){
-    if (mnItem.dataset.value==mainContent.lang){
+    if (mnItem.dataset.value==mainContent.language){
       //Item found, update the selectedItem to change the label
       mainContent.$.pdmLanguage.selectedItemLabel=mnItem.innerText;
       return true;
@@ -67,8 +67,8 @@ var setThemeAndLang = function(){
 mainContent.languageSelected = function(selMenu){
   //Changed selected language, update the value and store
   if(selMenu.detail.isSelected){
-    mainContent.lang=selMenu.detail.item.dataset.value;
-    chrome.storage.sync.set({'lang': mainContent.lang}, function() {
+    mainContent.language=selMenu.detail.item.dataset.value;
+    chrome.storage.sync.set({'language': mainContent.language}, function() {
       //Nothing to do
     });
 
diff --git a/manifest.json b/manifest.json
index f179588..6210e38 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,7 +4,7 @@
   "short_name": "PrettyCode",
   "description": "Code prettyfier following guidelines for GDE Videos",
 
-  "version": "0.0.1.0",
+  "version": "0.0.2.0",
 
   "icons": {
     "32": "assets/favicon_32.png",