diff --git a/main/template/default/layout/head.tpl b/main/template/default/layout/head.tpl
index 14eef970de..a77a592594 100644
--- a/main/template/default/layout/head.tpl
+++ b/main/template/default/layout/head.tpl
@@ -9,7 +9,6 @@
 <meta name="Generator" content="{{ _s.software_name }} {{ _s.system_version|slice(0,1) }}" />
 {#  Use the latest engine in ie8/ie9 or use google chrome engine if available  #}
 {#  Improve usability in portal devices #}
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>{{ title_string }}</title>
 {{ css_file_to_string }}
 {{ css_style_print }}
diff --git a/main/template/jqm/index/course_block.tpl b/main/template/jqm/index/course_block.tpl
deleted file mode 100644
index 70f218bb0a..0000000000
--- a/main/template/jqm/index/course_block.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{% include 'default/layout/block_menu.tpl' with {'block_menu': course_block} %}
\ No newline at end of file
diff --git a/main/template/jqm/index/course_session_block.tpl b/main/template/jqm/index/course_session_block.tpl
deleted file mode 100644
index 23b6c35e27..0000000000
--- a/main/template/jqm/index/course_session_block.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{% include 'default/layout/block_menu.tpl' with {'block_menu': course_session_block} %}
\ No newline at end of file
diff --git a/main/template/jqm/index/notice_block.tpl b/main/template/jqm/index/notice_block.tpl
deleted file mode 100644
index e6205c3492..0000000000
--- a/main/template/jqm/index/notice_block.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{% include 'default/layout/block_menu.tpl' with {'block_menu': notice_block} %}
\ No newline at end of file
diff --git a/main/template/jqm/index/skills_block.tpl b/main/template/jqm/index/skills_block.tpl
deleted file mode 100644
index d27587a19d..0000000000
--- a/main/template/jqm/index/skills_block.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{% include 'default/layout/block_menu.tpl' with {'block_menu': skills_block} %}
\ No newline at end of file
diff --git a/main/template/jqm/index/teacher_block.tpl b/main/template/jqm/index/teacher_block.tpl
deleted file mode 100644
index c9dd5c96ae..0000000000
--- a/main/template/jqm/index/teacher_block.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{% include 'default/layout/block_menu.tpl' with {'block_menu': teacher_block} %}
\ No newline at end of file
diff --git a/main/template/jqm/userportal/course_page.tpl b/main/template/jqm/userportal/course_page.tpl
deleted file mode 100644
index be719a0472..0000000000
--- a/main/template/jqm/userportal/course_page.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-{% extends "default/layout/layout_2_col.tpl" %}
-
diff --git a/main/template/jqm/userportal/index.tpl b/main/template/jqm/userportal/index.tpl
deleted file mode 100644
index 4fd1b8f775..0000000000
--- a/main/template/jqm/userportal/index.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "default/layout/layout_2_col.tpl" %}
\ No newline at end of file
diff --git a/main/template/jqm/admin/settings_index.tpl b/main/template/jquery_mobile/admin/settings_index.tpl
similarity index 95%
rename from main/template/jqm/admin/settings_index.tpl
rename to main/template/jquery_mobile/admin/settings_index.tpl
index 337b31b92b..81b6ff5d2e 100644
--- a/main/template/jqm/admin/settings_index.tpl
+++ b/main/template/jquery_mobile/admin/settings_index.tpl
@@ -1,4 +1,4 @@
-{% extends "default/layout/layout_1_col.tpl" %}
+{% extends "jquery_mobile/layout/layout_1_col.tpl" %}
 {% block content %}
 <script>
 $(function() {
@@ -45,4 +45,4 @@ $(function() {
     {% endfor %}
     </div>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/main/template/jqm/agenda/month.tpl b/main/template/jquery_mobile/agenda/month.tpl
similarity index 99%
rename from main/template/jqm/agenda/month.tpl
rename to main/template/jquery_mobile/agenda/month.tpl
index 59e3bcd7a5..730225330d 100644
--- a/main/template/jqm/agenda/month.tpl
+++ b/main/template/jquery_mobile/agenda/month.tpl
@@ -1,4 +1,4 @@
-{% extends "default/layout/layout_1_col.tpl" %}
+{% extends "jquery_mobile/layout/layout_1_col.tpl" %}
 {% block content %}
 <script>
 function checkLength( o, n, min, max ) {
@@ -136,7 +136,7 @@ $(document).ready(function() {
 			//Cleans the selected attr
 		    clean_user_select();
 
-            //Sets the 1st item selected by default
+            //Sets the 1st item selected by jquery_mobile
             //$('#users_to_send_id option').eq(0).attr('selected', 'selected');
 
 			//Update chz-select
@@ -509,4 +509,4 @@ $(document).ready(function() {
 <div id="loading" style="margin-left:150px;position:absolute;display:none">{{"Loading"|get_lang}}...</div>
 <div id="calendar"></div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/main/template/jqm/auth/categories_list.php b/main/template/jquery_mobile/auth/categories_list.php
similarity index 100%
rename from main/template/jqm/auth/categories_list.php
rename to main/template/jquery_mobile/auth/categories_list.php
diff --git a/main/template/jqm/auth/courses_categories.php b/main/template/jquery_mobile/auth/courses_categories.php
similarity index 100%
rename from main/template/jqm/auth/courses_categories.php
rename to main/template/jquery_mobile/auth/courses_categories.php
diff --git a/main/template/jqm/auth/courses_list.php b/main/template/jquery_mobile/auth/courses_list.php
similarity index 100%
rename from main/template/jqm/auth/courses_list.php
rename to main/template/jquery_mobile/auth/courses_list.php
diff --git a/main/template/jqm/auth/layout.php b/main/template/jquery_mobile/auth/layout.php
similarity index 100%
rename from main/template/jqm/auth/layout.php
rename to main/template/jquery_mobile/auth/layout.php
diff --git a/main/template/jqm/course_description/edit.tpl b/main/template/jquery_mobile/course_description/edit.tpl
similarity index 100%
rename from main/template/jqm/course_description/edit.tpl
rename to main/template/jquery_mobile/course_description/edit.tpl
diff --git a/main/template/jqm/course_description/index.tpl b/main/template/jquery_mobile/course_description/index.tpl
similarity index 100%
rename from main/template/jqm/course_description/index.tpl
rename to main/template/jquery_mobile/course_description/index.tpl
diff --git a/main/template/jqm/course_description/upload.tpl b/main/template/jquery_mobile/course_description/upload.tpl
similarity index 100%
rename from main/template/jqm/course_description/upload.tpl
rename to main/template/jquery_mobile/course_description/upload.tpl
diff --git a/main/template/jqm/create_course/add_course.tpl b/main/template/jquery_mobile/create_course/add_course.tpl
similarity index 96%
rename from main/template/jqm/create_course/add_course.tpl
rename to main/template/jquery_mobile/create_course/add_course.tpl
index 195fe6bca7..8c08db48ab 100644
--- a/main/template/jqm/create_course/add_course.tpl
+++ b/main/template/jquery_mobile/create_course/add_course.tpl
@@ -1,4 +1,4 @@
-{% extends "default/layout/layout_1_col.tpl" %}
+{% extends "jquery_mobile/layout/layout_1_col.tpl" %}
 
 {% block content %}
 
@@ -55,4 +55,4 @@
     </div>
 </div>
 <div class="clear"></div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/main/template/jqm/export/table_pdf.tpl b/main/template/jquery_mobile/export/table_pdf.tpl
similarity index 100%
rename from main/template/jqm/export/table_pdf.tpl
rename to main/template/jquery_mobile/export/table_pdf.tpl
diff --git a/main/template/jqm/form/form_custom_template.tpl b/main/template/jquery_mobile/form/form_custom_template.tpl
similarity index 94%
rename from main/template/jqm/form/form_custom_template.tpl
rename to main/template/jquery_mobile/form/form_custom_template.tpl
index 97f599404e..662d4d3501 100755
--- a/main/template/jqm/form/form_custom_template.tpl
+++ b/main/template/jquery_mobile/form/form_custom_template.tpl
@@ -12,7 +12,7 @@
 
 {% block form_widget_simple %}
 {% spaceless %}
-    {% set type = type|default('text') %}
+    {% set type = type|jquery_mobile('text') %}
     {% if attr.prepend_input is defined and attr.append_input is defined and attr.prepend_input is not empty and attr.append_input is not empty %}
         {{ block('form_widget_prepend_append_input') }}
     {% elseif attr.prepend_input is defined and attr.prepend_input is not empty %}
@@ -200,14 +200,14 @@
 {% block number_widget %}
 {% spaceless %}
     {# type="number" doesn't work with floats #}
-    {% set type = type|default('text') %}
+    {% set type = type|jquery_mobile('text') %}
     {{ block('form_widget_simple') }}
 {% endspaceless %}
 {% endblock number_widget %}
 
 {% block integer_widget %}
 {% spaceless %}
-    {% set type = type|default('number') %}
+    {% set type = type|jquery_mobile('number') %}
     {{ block('form_widget_simple') }}
 {% endspaceless %}
 {% endblock integer_widget %}
@@ -220,43 +220,43 @@
 
 {% block url_widget %}
 {% spaceless %}
-    {% set type = type|default('url') %}
+    {% set type = type|jquery_mobile('url') %}
     {{ block('form_widget_simple') }}
 {% endspaceless %}
 {% endblock url_widget %}
 
 {% block search_widget %}
 {% spaceless %}
-    {% set attr = attr|merge({'class': (attr.class|default('') ~ ' search-query')|trim}) %}
-    {% set type = type|default('search') %}
+    {% set attr = attr|merge({'class': (attr.class|jquery_mobile('') ~ ' search-query')|trim}) %}
+    {% set type = type|jquery_mobile('search') %}
     {{ block('form_widget_simple') }}
 {% endspaceless %}
 {% endblock search_widget %}
 
 {% block percent_widget %}
 {% spaceless %}
-    {% set type = type|default('text') %}
+    {% set type = type|jquery_mobile('text') %}
     {{ block('form_widget_simple') }} %
 {% endspaceless %}
 {% endblock percent_widget %}
 
 {% block password_widget %}
 {% spaceless %}
-    {% set type = type|default('password') %}
+    {% set type = type|jquery_mobile('password') %}
     {{ block('form_widget_simple') }}
 {% endspaceless %}
 {% endblock password_widget %}
 
 {% block hidden_widget %}
 {% spaceless %}
-    {% set type = type|default('hidden') %}
+    {% set type = type|jquery_mobile('hidden') %}
     {{ block('form_widget_simple') }}
 {% endspaceless %}
 {% endblock hidden_widget %}
 
 {% block email_widget %}
 {% spaceless %}
-    {% set type = type|default('email') %}
+    {% set type = type|jquery_mobile('email') %}
     {{ block('form_widget_simple') }}
 {% endspaceless %}
 {% endblock email_widget %}
@@ -269,10 +269,10 @@
         {% set label_attr = label_attr|merge({'for': id}) %}
     {% endif %}
     {% if required %}
-        {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' required')|trim}) %}
+        {% set label_attr = label_attr|merge({'class': (label_attr.class|jquery_mobile('') ~ ' required')|trim}) %}
     {% endif %}
     {% if form_type is defined and form_type == 'horizontal' %}
-        {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' control-label')|trim}) %}
+        {% set label_attr = label_attr|merge({'class': (label_attr.class|jquery_mobile('') ~ ' control-label')|trim}) %}
     {% endif %}
     {% if label is empty %}
         {% set label = name|humanize %}
@@ -286,12 +286,12 @@
     {% if not compound %}
         {% set label_attr = label_attr|merge({'for': id}) %}
     {% endif %}
-    {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' checkbox')|trim}) %}
+    {% set label_attr = label_attr|merge({'class': (label_attr.class|jquery_mobile('') ~ ' checkbox')|trim}) %}
     {% if attr.inline is defined and attr.inline %}
-        {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' inline')|trim}) %}
+        {% set label_attr = label_attr|merge({'class': (label_attr.class|jquery_mobile('') ~ ' inline')|trim}) %}
     {% endif %}
     {% if required %}
-        {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' required')|trim}) %}
+        {% set label_attr = label_attr|merge({'class': (label_attr.class|jquery_mobile('') ~ ' required')|trim}) %}
     {% endif %}
     {% if label is empty %}
         {% set label = name|humanize %}
@@ -307,9 +307,9 @@
     {% if not compound %}
         {% set label_attr = label_attr|merge({'for': id}) %}
     {% endif %}
-    {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' radio')|trim}) %}
+    {% set label_attr = label_attr|merge({'class': (label_attr.class|jquery_mobile('') ~ ' radio')|trim}) %}
     {% if required %}
-        {% set label_attr = label_attr|merge({'class': (label_attr.class|default('') ~ ' required')|trim}) %}
+        {% set label_attr = label_attr|merge({'class': (label_attr.class|jquery_mobile('') ~ ' required')|trim}) %}
     {% endif %}
     {% if label is empty %}
         {% set label = name|humanize %}
@@ -497,4 +497,4 @@ placed inside the label. See checkbox_label block.
 {% block field_enctype %}{{ block('form_enctype') }}{% endblock %}
 {% block field_errors %}{{ block('form_errors') }}{% endblock %}
 {% block field_rest %}{{ block('form_rest') }}{% endblock %}
-{% block field_rows %}{{ block('form_rows') }}{% endblock %}
\ No newline at end of file
+{% block field_rows %}{{ block('form_rows') }}{% endblock %}
diff --git a/main/template/jqm/glossary/csv.tpl b/main/template/jquery_mobile/glossary/csv.tpl
similarity index 100%
rename from main/template/jqm/glossary/csv.tpl
rename to main/template/jquery_mobile/glossary/csv.tpl
diff --git a/main/template/jqm/glossary/edit.tpl b/main/template/jquery_mobile/glossary/edit.tpl
similarity index 65%
rename from main/template/jqm/glossary/edit.tpl
rename to main/template/jquery_mobile/glossary/edit.tpl
index 4ce9afee15..828d561b4e 100644
--- a/main/template/jqm/glossary/edit.tpl
+++ b/main/template/jquery_mobile/glossary/edit.tpl
@@ -1,5 +1,5 @@
 
-{% include 'default/glossary/header.tpl' %}
+{% include 'jquery_mobile/glossary/header.tpl' %}
 
 <div class="actions-bar btn-toolbar" >
     <a href = "{{root}}&amp;action=index" class="btn">
@@ -7,4 +7,4 @@
     </a>
 </div>
 
-{{form.return_form()}}
\ No newline at end of file
+{{form.return_form()}}
diff --git a/main/template/jqm/glossary/header.tpl b/main/template/jquery_mobile/glossary/header.tpl
similarity index 100%
rename from main/template/jqm/glossary/header.tpl
rename to main/template/jquery_mobile/glossary/header.tpl
diff --git a/main/template/jqm/glossary/index.tpl b/main/template/jquery_mobile/glossary/index.tpl
similarity index 85%
rename from main/template/jqm/glossary/index.tpl
rename to main/template/jquery_mobile/glossary/index.tpl
index 8219833754..4ee2e81596 100644
--- a/main/template/jqm/glossary/index.tpl
+++ b/main/template/jquery_mobile/glossary/index.tpl
@@ -1,5 +1,5 @@
-{% include 'default/glossary/header.tpl' %}
-{% include 'default/glossary/javascript.tpl' %}
+{% include 'jquery_mobile/glossary/header.tpl' %}
+{% include 'jquery_mobile/glossary/javascript.tpl' %}
 
 <div class="btn-toolbar actions-bar" >
     {% if is_allowed_to_edit %}
@@ -33,7 +33,7 @@
 </div>
 
 {% if view == 'table' %}
-    {% include 'default/glossary/table.tpl' %}
+    {% include 'jquery_mobile/glossary/table.tpl' %}
 {% else %}
-    {% include 'default/glossary/list.tpl' %}
+    {% include 'jquery_mobile/glossary/list.tpl' %}
 {% endif %}
diff --git a/main/template/jqm/glossary/javascript.tpl b/main/template/jquery_mobile/glossary/javascript.tpl
similarity index 100%
rename from main/template/jqm/glossary/javascript.tpl
rename to main/template/jquery_mobile/glossary/javascript.tpl
diff --git a/main/template/jqm/glossary/list.tpl b/main/template/jquery_mobile/glossary/list.tpl
similarity index 100%
rename from main/template/jqm/glossary/list.tpl
rename to main/template/jquery_mobile/glossary/list.tpl
diff --git a/main/template/jqm/glossary/table.tpl b/main/template/jquery_mobile/glossary/table.tpl
similarity index 100%
rename from main/template/jqm/glossary/table.tpl
rename to main/template/jquery_mobile/glossary/table.tpl
diff --git a/main/template/jqm/glossary/upload.tpl b/main/template/jquery_mobile/glossary/upload.tpl
similarity index 65%
rename from main/template/jqm/glossary/upload.tpl
rename to main/template/jquery_mobile/glossary/upload.tpl
index 8b1f3ab5be..993612074f 100644
--- a/main/template/jqm/glossary/upload.tpl
+++ b/main/template/jquery_mobile/glossary/upload.tpl
@@ -1,4 +1,4 @@
-{% include 'default/glossary/header.tpl' %}
+{% include 'jquery_mobile/glossary/header.tpl' %}
 
 <div class="actions-bar btn-toolbar" >
     <a href = "{{root}}&amp;action=index" class="btn">
@@ -6,4 +6,4 @@
     </a>
 </div>
 
-{{form.return_form()}}
\ No newline at end of file
+{{form.return_form()}}
diff --git a/main/template/jquery_mobile/index/course_block.tpl b/main/template/jquery_mobile/index/course_block.tpl
new file mode 100644
index 0000000000..bf4e700a0f
--- /dev/null
+++ b/main/template/jquery_mobile/index/course_block.tpl
@@ -0,0 +1 @@
+{% include 'jquery_mobile/layout/block_menu.tpl' with {'block_menu': course_block} %}
diff --git a/main/template/jquery_mobile/index/course_session_block.tpl b/main/template/jquery_mobile/index/course_session_block.tpl
new file mode 100644
index 0000000000..ca62e773e4
--- /dev/null
+++ b/main/template/jquery_mobile/index/course_session_block.tpl
@@ -0,0 +1 @@
+{% include 'jquery_mobile/layout/block_menu.tpl' with {'block_menu': course_session_block} %}
diff --git a/main/template/jqm/index/help_block.tpl b/main/template/jquery_mobile/index/help_block.tpl
similarity index 72%
rename from main/template/jqm/index/help_block.tpl
rename to main/template/jquery_mobile/index/help_block.tpl
index 1f9b4a7e86..1ccd3e50cf 100644
--- a/main/template/jqm/index/help_block.tpl
+++ b/main/template/jquery_mobile/index/help_block.tpl
@@ -1,8 +1,8 @@
 {% set block_menu =  help_block %}
-{% extends "default/layout/block_menu.tpl" %}
+{% extends "jquery_mobile/layout/block_menu.tpl" %}
 {% block block_menu_item %}
     <h4>{{ block_menu.title }}</h4>
     <ul class="nav nav-list">
         {{ block_menu.content }}</ul>
     </ul>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/main/template/jquery_mobile/index/notice_block.tpl b/main/template/jquery_mobile/index/notice_block.tpl
new file mode 100644
index 0000000000..c69d967d2d
--- /dev/null
+++ b/main/template/jquery_mobile/index/notice_block.tpl
@@ -0,0 +1 @@
+{% include 'jquery_mobile/layout/block_menu.tpl' with {'block_menu': notice_block} %}
diff --git a/main/template/jqm/index/profile_block.tpl b/main/template/jquery_mobile/index/profile_block.tpl
similarity index 87%
rename from main/template/jqm/index/profile_block.tpl
rename to main/template/jquery_mobile/index/profile_block.tpl
index 23f6e7a972..ad84a14e3e 100644
--- a/main/template/jqm/index/profile_block.tpl
+++ b/main/template/jquery_mobile/index/profile_block.tpl
@@ -1,5 +1,5 @@
 {% set block_menu =  profile_block %}
-{% extends "default/layout/block_menu.tpl" %}
+{% extends "jquery_mobile/layout/block_menu.tpl" %}
 {% block block_menu_item %}
     <h4>{{ block_menu.title }}</h4>
     <ul class="nav nav-list">
@@ -7,4 +7,4 @@
         <li><a href="{{ _p.web }}main/messages/new_message.php">{{ 'Compose' | get_lang }}</a></li>
         <li><a href="{{ _p.web }}main/auth/profile.php">{{ 'EditProfile' | get_lang }}</a></li>
     </ul>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/main/template/jqm/index/profile_social_block.tpl b/main/template/jquery_mobile/index/profile_social_block.tpl
similarity index 90%
rename from main/template/jqm/index/profile_social_block.tpl
rename to main/template/jquery_mobile/index/profile_social_block.tpl
index b540f75501..68d8061e8c 100644
--- a/main/template/jqm/index/profile_social_block.tpl
+++ b/main/template/jquery_mobile/index/profile_social_block.tpl
@@ -1,5 +1,5 @@
 {% set block_menu =  profile_social_block %}
-{% extends "default/layout/block_menu.tpl" %}
+{% extends "jquery_mobile/layout/block_menu.tpl" %}
 {% block block_menu_item %}
     <h4>{{ block_menu.title }}</h4>
     <ul class="nav nav-list">
@@ -8,4 +8,4 @@
         <li><a href="{{ _p.web}}main/social/invitations.php"> {{ 'PendingInvitations' | get_lang }} {{ _u.messages_invitations_count}}</a></li>
         <li><a href="{{ _p.web }}main/auth/profile.php">{{ 'EditProfile' | get_lang }}</a></li>
     </ul>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/main/template/jquery_mobile/index/skills_block.tpl b/main/template/jquery_mobile/index/skills_block.tpl
new file mode 100644
index 0000000000..c6fbaae61d
--- /dev/null
+++ b/main/template/jquery_mobile/index/skills_block.tpl
@@ -0,0 +1 @@
+{% include 'jquery_mobile/layout/block_menu.tpl' with {'block_menu': skills_block} %}
diff --git a/main/template/jquery_mobile/index/teacher_block.tpl b/main/template/jquery_mobile/index/teacher_block.tpl
new file mode 100644
index 0000000000..9fa2a4e762
--- /dev/null
+++ b/main/template/jquery_mobile/index/teacher_block.tpl
@@ -0,0 +1 @@
+{% include 'jquery_mobile/layout/block_menu.tpl' with {'block_menu': teacher_block} %}
diff --git a/main/template/jqm/index/user_image_block.tpl b/main/template/jquery_mobile/index/user_image_block.tpl
similarity index 69%
rename from main/template/jqm/index/user_image_block.tpl
rename to main/template/jquery_mobile/index/user_image_block.tpl
index dc0382992f..173acc7ac8 100644
--- a/main/template/jqm/index/user_image_block.tpl
+++ b/main/template/jquery_mobile/index/user_image_block.tpl
@@ -1,7 +1,7 @@
 {% set block_menu =  user_image_block %}
-{% extends "default/layout/block_menu.tpl" %}
+{% extends "jquery_mobile/layout/block_menu.tpl" %}
 {% block block_menu_item %}
     <div style="text-align:center;">
         {{ user_image_block.content }}
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/main/template/jqm/layout/blank.tpl b/main/template/jquery_mobile/layout/blank.tpl
similarity index 100%
rename from main/template/jqm/layout/blank.tpl
rename to main/template/jquery_mobile/layout/blank.tpl
diff --git a/main/template/jqm/layout/block_menu.tpl b/main/template/jquery_mobile/layout/block_menu.tpl
similarity index 100%
rename from main/template/jqm/layout/block_menu.tpl
rename to main/template/jquery_mobile/layout/block_menu.tpl
diff --git a/main/template/jqm/layout/course_navigation.tpl b/main/template/jquery_mobile/layout/course_navigation.tpl
similarity index 100%
rename from main/template/jqm/layout/course_navigation.tpl
rename to main/template/jquery_mobile/layout/course_navigation.tpl
diff --git a/main/template/jqm/layout/error.tpl b/main/template/jquery_mobile/layout/error.tpl
similarity index 64%
rename from main/template/jqm/layout/error.tpl
rename to main/template/jquery_mobile/layout/error.tpl
index c34cc8b15c..2f637aa10e 100644
--- a/main/template/jqm/layout/error.tpl
+++ b/main/template/jquery_mobile/layout/error.tpl
@@ -1,4 +1,4 @@
-{% extends 'jqm/layout/layout_1_col.tpl' %}
+{% extends 'jquery_mobile/layout/layout_1_col.tpl' %}
 {% block content %}
     {{ error_code }} - {{ error_message }}
     {{ content }}
diff --git a/main/template/jqm/layout/footer.tpl b/main/template/jquery_mobile/layout/footer.tpl
similarity index 100%
rename from main/template/jqm/layout/footer.tpl
rename to main/template/jquery_mobile/layout/footer.tpl
diff --git a/main/template/jqm/layout/head.tpl b/main/template/jquery_mobile/layout/head.tpl
similarity index 100%
rename from main/template/jqm/layout/head.tpl
rename to main/template/jquery_mobile/layout/head.tpl
diff --git a/main/template/jqm/layout/hot_course_item.tpl b/main/template/jquery_mobile/layout/hot_course_item.tpl
similarity index 100%
rename from main/template/jqm/layout/hot_course_item.tpl
rename to main/template/jquery_mobile/layout/hot_course_item.tpl
diff --git a/main/template/jqm/layout/hot_course_item_popup.tpl b/main/template/jquery_mobile/layout/hot_course_item_popup.tpl
similarity index 100%
rename from main/template/jqm/layout/hot_course_item_popup.tpl
rename to main/template/jquery_mobile/layout/hot_course_item_popup.tpl
diff --git a/main/template/jqm/layout/hot_courses.tpl b/main/template/jquery_mobile/layout/hot_courses.tpl
similarity index 95%
rename from main/template/jqm/layout/hot_courses.tpl
rename to main/template/jquery_mobile/layout/hot_courses.tpl
index 7b21b4fa60..adde07a2bc 100644
--- a/main/template/jqm/layout/hot_courses.tpl
+++ b/main/template/jquery_mobile/layout/hot_courses.tpl
@@ -35,7 +35,7 @@ $(document).ready( function() {
                 {{ "HottestCourses"|display_page_subheader }}
             </div>            
                 
-            {% include 'jqm/layout/hot_course_item.tpl' %}
+            {% include 'jquery_mobile/layout/hot_course_item.tpl' %}
         </div>
     </section>
 {% endif %}
diff --git a/main/template/jqm/layout/layout_1_col.tpl b/main/template/jquery_mobile/layout/layout_1_col.tpl
similarity index 88%
rename from main/template/jqm/layout/layout_1_col.tpl
rename to main/template/jquery_mobile/layout/layout_1_col.tpl
index 44b3c93577..a8d57bc1f8 100644
--- a/main/template/jqm/layout/layout_1_col.tpl
+++ b/main/template/jquery_mobile/layout/layout_1_col.tpl
@@ -1,4 +1,4 @@
-{% extends "jqm/layout/main.tpl" %}
+{% extends "jquery_mobile/layout/main.tpl" %}
 
 {#  1 column  #}
 {% block body %}
@@ -14,7 +14,7 @@
         <div class="span12">
     {% endif %}
 
-        {% include "jqm/layout/page_body.tpl" %}
+        {% include "jquery_mobile/layout/page_body.tpl" %}
 
         {% block content %}
             {% if content is not null %}
diff --git a/main/template/jqm/layout/layout_2_col.tpl b/main/template/jquery_mobile/layout/layout_2_col.tpl
similarity index 75%
rename from main/template/jqm/layout/layout_2_col.tpl
rename to main/template/jquery_mobile/layout/layout_2_col.tpl
index 88e029bd16..0c54d1a7cb 100644
--- a/main/template/jqm/layout/layout_2_col.tpl
+++ b/main/template/jquery_mobile/layout/layout_2_col.tpl
@@ -1,4 +1,4 @@
-{% extends "jqm/layout/main.tpl" %}
+{% extends "jquery_mobile/layout/main.tpl" %}
 
 {% block body %}
 	{# Main content #}
@@ -13,31 +13,31 @@
 
 	    {# if user is not login show the login form #}
 		{% if _u.logged  == 0 %}
-			{% include "jqm/layout/login_form.tpl" %}
+			{% include "jquery_mobile/layout/login_form.tpl" %}
 		{% endif %}
 
         {#  course_session_block #}
-        {% include "jqm/index/course_session_block.tpl" %}
+        {% include "jquery_mobile/index/course_session_block.tpl" %}
 
 		{#  User picture  #}
-        {% include "jqm/index/user_image_block.tpl" %}
+        {% include "jquery_mobile/index/user_image_block.tpl" %}
 
         {#  User Profile links #}
-        {% include "jqm/index/profile_block.tpl" %}
+        {% include "jquery_mobile/index/profile_block.tpl" %}
 
-        {% include "jqm/index/profile_social_block.tpl" %}
+        {% include "jquery_mobile/index/profile_social_block.tpl" %}
 
         {#  Course block - admin #}
-        {% include "jqm/index/course_block.tpl" %}
+        {% include "jquery_mobile/index/course_block.tpl" %}
 
         {#  Course block - teacher #}
-        {% include "jqm/index/teacher_block.tpl" %}
+        {% include "jquery_mobile/index/teacher_block.tpl" %}
 
 		{#  Notice  #}
-        {% include "jqm/index/notice_block.tpl" %}
+        {% include "jquery_mobile/index/notice_block.tpl" %}
 
         {#  Help #}
-		{% include "jqm/index/help_block.tpl" %}
+		{% include "jquery_mobile/index/help_block.tpl" %}
 
 		{#  Links that are not added in the tabs #}
 		{{ navigation_course_links }}
@@ -52,7 +52,7 @@
 		{{ classes_block }}
 
 		{#  Skills #}
-        {% include "jqm/index/skills_block.tpl" %}
+        {% include "jquery_mobile/index/skills_block.tpl" %}
 
 		{#  Plugin courses sidebar  #}
         {#  Plugins for footer section  #}
@@ -86,7 +86,7 @@
 		{#  ??  #}
 		{{ sniff_notification }}
 
-        {% include "jqm/layout/page_body.tpl" %}
+        {% include "jquery_mobile/layout/page_body.tpl" %}
 
         {% if content is not null %}
             <section id="main_content">
@@ -94,7 +94,7 @@
             </section>
         {% endif %}
 
-        {% include "jqm/layout/page_post_body.tpl" %}
+        {% include "jquery_mobile/layout/page_post_body.tpl" %}
 
 		{#  Announcements  #}
         {% if announcements_block %}
@@ -115,7 +115,7 @@
         {% endif %}
 
 		{#  Hot courses template  #}
-		{% include "jqm/layout/hot_courses.tpl" %}
+		{% include "jquery_mobile/layout/hot_courses.tpl" %}
 
         {#  Content bottom  #}
         {% if plugin_content_bottom %}
diff --git a/main/template/jqm/layout/layout_3_col.tpl b/main/template/jquery_mobile/layout/layout_3_col.tpl
similarity index 91%
rename from main/template/jqm/layout/layout_3_col.tpl
rename to main/template/jquery_mobile/layout/layout_3_col.tpl
index d430d2315f..ccac0aa548 100644
--- a/main/template/jqm/layout/layout_3_col.tpl
+++ b/main/template/jquery_mobile/layout/layout_3_col.tpl
@@ -1,5 +1,5 @@
 {#  This template is NOT used in chamilo 1.9 #}
-{% extends "jqm/layout/main.tpl" %}
+{% extends "jquery_mobile/layout/main.tpl" %}
 
 {% block body %}
 	<div id="maincontent" class="maincontent">
diff --git a/main/template/jqm/layout/login_form.tpl b/main/template/jquery_mobile/layout/login_form.tpl
similarity index 100%
rename from main/template/jqm/layout/login_form.tpl
rename to main/template/jquery_mobile/layout/login_form.tpl
diff --git a/main/template/jqm/layout/main.tpl b/main/template/jquery_mobile/layout/main.tpl
similarity index 70%
rename from main/template/jqm/layout/main.tpl
rename to main/template/jquery_mobile/layout/main.tpl
index c2e7d9f535..2aa4ac0981 100644
--- a/main/template/jqm/layout/main.tpl
+++ b/main/template/jquery_mobile/layout/main.tpl
@@ -1,10 +1,10 @@
 {% block header %}
-{% include "jqm/layout/main_header.tpl" %}
+{% include "jquery_mobile/layout/main_header.tpl" %}
 {% endblock %}
 
 {% block body %}
 	{% if show_sniff == 1 %}
-	 	{% include "jqm/layout/sniff.tpl" %}
+	 	{% include "jquery_mobile/layout/sniff.tpl" %}
 	{% endif %}
 {% endblock %}
 
@@ -16,6 +16,6 @@
         <div class="push"></div>
         </div> <!-- end of #wrapper section -->
     {% endif %}
-{% include "jqm/layout/main_footer.tpl" %}
+{% include "jquery_mobile/layout/main_footer.tpl" %}
 {{ xhprof }}
 {% endblock %}
diff --git a/main/template/jqm/layout/main_footer.tpl b/main/template/jquery_mobile/layout/main_footer.tpl
similarity index 52%
rename from main/template/jqm/layout/main_footer.tpl
rename to main/template/jquery_mobile/layout/main_footer.tpl
index ce81bcccca..cee4bccd1b 100644
--- a/main/template/jqm/layout/main_footer.tpl
+++ b/main/template/jquery_mobile/layout/main_footer.tpl
@@ -1,5 +1,5 @@
 {% if show_footer == true %}
-    {% include "jqm/layout/footer.tpl" %}
+    {% include "jquery_mobile/layout/footer.tpl" %}
 {% endif %}
 </body>
 </html>
diff --git a/main/template/jqm/layout/main_header.tpl b/main/template/jquery_mobile/layout/main_header.tpl
similarity index 94%
rename from main/template/jqm/layout/main_header.tpl
rename to main/template/jquery_mobile/layout/main_header.tpl
index 8beff30163..5ffd086eae 100644
--- a/main/template/jqm/layout/main_header.tpl
+++ b/main/template/jquery_mobile/layout/main_header.tpl
@@ -4,7 +4,7 @@
 <!--[if IE 8]>    <html lang="{{ document_language }}" class="no-js lt-ie9"> <![endif]-->
 <!--[if gt IE 8]><!--><html lang="{{ document_language }}" class="no-js"> <!--<![endif]-->
 <head>
-{% include "jqm/layout/head.tpl" %}
+{% include "jquery_mobile/layout/head.tpl" %}
 </head>
 <body dir="{{ text_direction }}" class="{{ section_name }}">
 <noscript>{{ "NoJavascript"|get_lang }}</noscript>
@@ -40,7 +40,7 @@
         </ul>
 
         {# topbar #}
-        {% include "jqm/layout/topbar.tpl" %}
+        {% include "jquery_mobile/layout/topbar.tpl" %}
 
         <div id="main" class="container" data-role="page">
             <header data-role="header">
@@ -91,7 +91,7 @@
                 {% endif %}
 
                 {# menu #}
-                {% include "jqm/layout/menu.tpl" %}
+                {% include "jquery_mobile/layout/menu.tpl" %}
 
                 {# breadcrumb #}
                 {{ breadcrumb }}
@@ -99,5 +99,5 @@
 
             <div id="top_main_content" class="row">
             {# course navigation links/shortcuts need to be activated by the admin #}
-            {% include "jqm/layout/course_navigation.tpl" %}
+            {% include "jquery_mobile/layout/course_navigation.tpl" %}
 {% endif %}
diff --git a/main/template/jqm/layout/menu.tpl b/main/template/jquery_mobile/layout/menu.tpl
similarity index 100%
rename from main/template/jqm/layout/menu.tpl
rename to main/template/jquery_mobile/layout/menu.tpl
diff --git a/main/template/jqm/layout/no_layout.tpl b/main/template/jquery_mobile/layout/no_layout.tpl
similarity index 92%
rename from main/template/jqm/layout/no_layout.tpl
rename to main/template/jquery_mobile/layout/no_layout.tpl
index 4a88df8a3e..60e0ccf1b4 100644
--- a/main/template/jqm/layout/no_layout.tpl
+++ b/main/template/jquery_mobile/layout/no_layout.tpl
@@ -4,7 +4,7 @@
 <!--[if IE 8]>    <html lang="{{document_language}}" class="no-js lt-ie9"> <![endif]-->
 <!--[if gt IE 8]><!--><html lang="{{document_language}}" class="no-js"> <!--<![endif]-->
 <head>
-{% include "jqm/layout/head.tpl" %}
+{% include "jquery_mobile/layout/head.tpl" %}
 </head>
 <body dir="{{text_direction}}" class="{{section_name}}">
 {% block name %}
diff --git a/main/template/jqm/layout/page_body.tpl b/main/template/jquery_mobile/layout/page_body.tpl
similarity index 89%
rename from main/template/jqm/layout/page_body.tpl
rename to main/template/jquery_mobile/layout/page_body.tpl
index fa5c505cf0..29aeef1348 100644
--- a/main/template/jqm/layout/page_body.tpl
+++ b/main/template/jquery_mobile/layout/page_body.tpl
@@ -26,6 +26,6 @@
 {#  Welcome to course block  #}
 {% if welcome_to_course_block %}
     <section id="welcome_to_course">
-        {% include "jqm/layout/welcome_to_course.tpl" %}
+        {% include "jquery_mobile/layout/welcome_to_course.tpl" %}
     </section>
 {% endif %}
diff --git a/main/template/jqm/layout/page_post_body.tpl b/main/template/jquery_mobile/layout/page_post_body.tpl
similarity index 100%
rename from main/template/jqm/layout/page_post_body.tpl
rename to main/template/jquery_mobile/layout/page_post_body.tpl
diff --git a/main/template/jqm/layout/show_footer.tpl b/main/template/jquery_mobile/layout/show_footer.tpl
similarity index 92%
rename from main/template/jqm/layout/show_footer.tpl
rename to main/template/jquery_mobile/layout/show_footer.tpl
index 59a168059c..2aadf4b06d 100644
--- a/main/template/jqm/layout/show_footer.tpl
+++ b/main/template/jquery_mobile/layout/show_footer.tpl
@@ -21,4 +21,4 @@
 </div> <!-- end of #wrapper section -->
 {% endif %}
 
-{% include "jqm/layout/main_footer.tpl" %}
+{% include "jquery_mobile/layout/main_footer.tpl" %}
diff --git a/main/template/jqm/layout/show_header.tpl b/main/template/jquery_mobile/layout/show_header.tpl
similarity index 83%
rename from main/template/jqm/layout/show_header.tpl
rename to main/template/jquery_mobile/layout/show_header.tpl
index 1035afe614..2acd5542a7 100644
--- a/main/template/jqm/layout/show_header.tpl
+++ b/main/template/jquery_mobile/layout/show_header.tpl
@@ -1,4 +1,4 @@
-{% include "jqm/layout/main_header.tpl" %}
+{% include "jquery_mobile/layout/main_header.tpl" %}
 {#
     show_header and show_footer templates are only called when using the Display::display_header and Display::display_footer
     for backward compatibility we suppose that the default layout is one column which means using a div with class span12
@@ -11,6 +11,6 @@
             </div>
         {% endif %}
         <div class="span12">
-            {% include "jqm/layout/page_body.tpl" %}
+            {% include "jquery_mobile/layout/page_body.tpl" %}
             <section id="main_content" data-role="content">
 {% endif %}
diff --git a/main/template/jqm/layout/sniff.tpl b/main/template/jquery_mobile/layout/sniff.tpl
similarity index 100%
rename from main/template/jqm/layout/sniff.tpl
rename to main/template/jquery_mobile/layout/sniff.tpl
diff --git a/main/template/jqm/layout/social_layout.tpl b/main/template/jquery_mobile/layout/social_layout.tpl
similarity index 89%
rename from main/template/jqm/layout/social_layout.tpl
rename to main/template/jquery_mobile/layout/social_layout.tpl
index dc83518e54..fdfb8b13a6 100644
--- a/main/template/jqm/layout/social_layout.tpl
+++ b/main/template/jquery_mobile/layout/social_layout.tpl
@@ -1,4 +1,4 @@
-{% extends "jqm/layout/layout_1_col.tpl" %}
+{% extends "jquery_mobile/layout/layout_1_col.tpl" %}
 
 {% block content %}
     <div class="row">
diff --git a/main/template/jqm/layout/topbar.tpl b/main/template/jquery_mobile/layout/topbar.tpl
similarity index 100%
rename from main/template/jqm/layout/topbar.tpl
rename to main/template/jquery_mobile/layout/topbar.tpl
diff --git a/main/template/jqm/layout/welcome_to_course.tpl b/main/template/jquery_mobile/layout/welcome_to_course.tpl
similarity index 100%
rename from main/template/jqm/layout/welcome_to_course.tpl
rename to main/template/jquery_mobile/layout/welcome_to_course.tpl
diff --git a/main/template/jqm/learnpath/impress.tpl b/main/template/jquery_mobile/learnpath/impress.tpl
similarity index 100%
rename from main/template/jqm/learnpath/impress.tpl
rename to main/template/jquery_mobile/learnpath/impress.tpl
diff --git a/main/template/jqm/learnpath/subscribe_users.tpl b/main/template/jquery_mobile/learnpath/subscribe_users.tpl
similarity index 96%
rename from main/template/jqm/learnpath/subscribe_users.tpl
rename to main/template/jquery_mobile/learnpath/subscribe_users.tpl
index da8a86cb87..c704c0f019 100644
--- a/main/template/jqm/learnpath/subscribe_users.tpl
+++ b/main/template/jquery_mobile/learnpath/subscribe_users.tpl
@@ -1,4 +1,4 @@
-{% extends "default/layout/layout_1_col.tpl" %}
+{% extends "jquery_mobile/layout/layout_1_col.tpl" %}
 {% block content %}
     {#
     <h2>{{ 'SubscribeUsersToLp' | get_lang }}</h2>
@@ -46,4 +46,4 @@
     #}
     {{ formUsers }}
     {{ formGroups }}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/main/template/jqm/link/edit_category.tpl b/main/template/jquery_mobile/link/edit_category.tpl
similarity index 100%
rename from main/template/jqm/link/edit_category.tpl
rename to main/template/jquery_mobile/link/edit_category.tpl
diff --git a/main/template/jqm/link/edit_link.tpl b/main/template/jquery_mobile/link/edit_link.tpl
similarity index 100%
rename from main/template/jqm/link/edit_link.tpl
rename to main/template/jquery_mobile/link/edit_link.tpl
diff --git a/main/template/jqm/link/index.tpl b/main/template/jquery_mobile/link/index.tpl
similarity index 100%
rename from main/template/jqm/link/index.tpl
rename to main/template/jquery_mobile/link/index.tpl
diff --git a/main/template/jqm/mail_editor/email_link.js.tpl b/main/template/jquery_mobile/mail_editor/email_link.js.tpl
similarity index 97%
rename from main/template/jqm/mail_editor/email_link.js.tpl
rename to main/template/jquery_mobile/mail_editor/email_link.js.tpl
index 94c475d3ae..0d188ea705 100644
--- a/main/template/jqm/mail_editor/email_link.js.tpl
+++ b/main/template/jquery_mobile/mail_editor/email_link.js.tpl
@@ -55,7 +55,7 @@ function loadEmailEditor(e) {
 	//el is now my link object, so I can get el.href here to load the new window
 	var link = el.href.replace('mailto:','');
 	document.location = "{{ _p.web_main }}inc/lib/email_editor.php?dest=" + link;
-	//cancel default link action
+	//cancel jquery_mobile link action
 	if (window.event && window.event.returnValue){
 		window.event.returnValue = false;
 	}
@@ -68,4 +68,4 @@ $(document).ready(function() {
     addEvent(window,'load',addListeners,false);
 });
 
-</script>
\ No newline at end of file
+</script>
diff --git a/main/template/jqm/notebook/upload.tpl b/main/template/jquery_mobile/notebook/edit.tpl
similarity index 65%
rename from main/template/jqm/notebook/upload.tpl
rename to main/template/jquery_mobile/notebook/edit.tpl
index 54dc5810fe..1bc933d8c7 100644
--- a/main/template/jqm/notebook/upload.tpl
+++ b/main/template/jquery_mobile/notebook/edit.tpl
@@ -1,4 +1,5 @@
-{% include 'default/notebook/header.tpl' %}
+
+{% include 'jquery_mobile/notebook/header.tpl' %}
 
 <div class="actions-bar btn-toolbar" >
     <a href = "{{root}}&amp;action=index" class="btn back">
@@ -6,4 +7,4 @@
     </a>
 </div>
 
-{{form.return_form()}}
\ No newline at end of file
+{{form.return_form()}}
diff --git a/main/template/jqm/notebook/header.tpl b/main/template/jquery_mobile/notebook/header.tpl
similarity index 100%
rename from main/template/jqm/notebook/header.tpl
rename to main/template/jquery_mobile/notebook/header.tpl
diff --git a/main/template/jqm/notebook/index.tpl b/main/template/jquery_mobile/notebook/index.tpl
similarity index 90%
rename from main/template/jqm/notebook/index.tpl
rename to main/template/jquery_mobile/notebook/index.tpl
index 33223a7398..524b52ec5c 100644
--- a/main/template/jqm/notebook/index.tpl
+++ b/main/template/jquery_mobile/notebook/index.tpl
@@ -1,5 +1,5 @@
-{% include 'default/notebook/header.tpl' %}
-{% include 'default/notebook/javascript.tpl' %}
+{% include 'jquery_mobile/notebook/header.tpl' %}
+{% include 'jquery_mobile/notebook/javascript.tpl' %}
 
 <div class="btn-toolbar actions-bar" >
     {% if is_allowed_to_edit %}
@@ -37,5 +37,5 @@
     </div>
 </div>
 
-{% include 'default/notebook/list.tpl' %}
+{% include 'jquery_mobile/notebook/list.tpl' %}
 
diff --git a/main/template/jqm/notebook/javascript.tpl b/main/template/jquery_mobile/notebook/javascript.tpl
similarity index 100%
rename from main/template/jqm/notebook/javascript.tpl
rename to main/template/jquery_mobile/notebook/javascript.tpl
diff --git a/main/template/jqm/notebook/list.tpl b/main/template/jquery_mobile/notebook/list.tpl
similarity index 100%
rename from main/template/jqm/notebook/list.tpl
rename to main/template/jquery_mobile/notebook/list.tpl
diff --git a/main/template/jqm/notebook/edit.tpl b/main/template/jquery_mobile/notebook/upload.tpl
similarity index 75%
rename from main/template/jqm/notebook/edit.tpl
rename to main/template/jquery_mobile/notebook/upload.tpl
index 244ffab0dc..0ca4792fa3 100644
--- a/main/template/jqm/notebook/edit.tpl
+++ b/main/template/jquery_mobile/notebook/upload.tpl
@@ -1,5 +1,4 @@
-
-{% include 'default/notebook/header.tpl' %}
+{% include 'jquery_mobile/notebook/header.tpl' %}
 
 <div class="actions-bar btn-toolbar" >
     <a href = "{{root}}&amp;action=index" class="btn back">
diff --git a/main/template/jqm/pages/add.tpl b/main/template/jquery_mobile/pages/add.tpl
similarity index 71%
rename from main/template/jqm/pages/add.tpl
rename to main/template/jquery_mobile/pages/add.tpl
index 57eaabf34e..6087e2f03a 100755
--- a/main/template/jqm/pages/add.tpl
+++ b/main/template/jquery_mobile/pages/add.tpl
@@ -1,8 +1,8 @@
-{% extends "default/layout/layout_1_col.tpl" %}
+{% extends "jquery_mobile/layout/layout_1_col.tpl" %}
 
 {% block content %}
 <form action="#" method="post">
     {{ form_widget(form) }}
     <input class="btn" type="submit" name="submit" value="{{ "Send" | get_lang }}" />
 </form>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/main/template/jqm/pages/listing.tpl b/main/template/jquery_mobile/pages/listing.tpl
similarity index 84%
rename from main/template/jqm/pages/listing.tpl
rename to main/template/jquery_mobile/pages/listing.tpl
index 72ae7d53da..1e97581e8d 100755
--- a/main/template/jqm/pages/listing.tpl
+++ b/main/template/jquery_mobile/pages/listing.tpl
@@ -1,4 +1,4 @@
-{% extends "default/layout/layout_1_col.tpl" %}
+{% extends "jquery_mobile/layout/layout_1_col.tpl" %}
 
 {% block content %}
     {% for page in pages %}
@@ -11,4 +11,4 @@
         <br />
     {% endfor %}
     {{ pagination }}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/main/template/jqm/pages/show.tpl b/main/template/jquery_mobile/pages/show.tpl
similarity index 61%
rename from main/template/jqm/pages/show.tpl
rename to main/template/jquery_mobile/pages/show.tpl
index e786091bf3..d99cf4671e 100755
--- a/main/template/jqm/pages/show.tpl
+++ b/main/template/jquery_mobile/pages/show.tpl
@@ -1,8 +1,8 @@
-{% extends 'default/layout/layout_1_col.tpl' %}
+{% extends 'jquery_mobile/layout/layout_1_col.tpl' %}
 
 {% block content %}
     {{ page|var_dump}}
     {{ page.title }}
     {{ page.slug }}
     {{ page.content }}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/main/template/jqm/skill/profile.tpl b/main/template/jquery_mobile/skill/profile.tpl
similarity index 100%
rename from main/template/jqm/skill/profile.tpl
rename to main/template/jquery_mobile/skill/profile.tpl
diff --git a/main/template/jqm/skill/profile_item.tpl b/main/template/jquery_mobile/skill/profile_item.tpl
similarity index 100%
rename from main/template/jqm/skill/profile_item.tpl
rename to main/template/jquery_mobile/skill/profile_item.tpl
diff --git a/main/template/jqm/skill/skill_ranking.tpl b/main/template/jquery_mobile/skill/skill_ranking.tpl
similarity index 100%
rename from main/template/jqm/skill/skill_ranking.tpl
rename to main/template/jquery_mobile/skill/skill_ranking.tpl
diff --git a/main/template/jqm/skill/skill_tree.tpl b/main/template/jquery_mobile/skill/skill_tree.tpl
similarity index 100%
rename from main/template/jqm/skill/skill_tree.tpl
rename to main/template/jquery_mobile/skill/skill_tree.tpl
diff --git a/main/template/jqm/skill/skill_tree_student.tpl b/main/template/jquery_mobile/skill/skill_tree_student.tpl
similarity index 99%
rename from main/template/jqm/skill/skill_tree_student.tpl
rename to main/template/jquery_mobile/skill/skill_tree_student.tpl
index fdb7dab51c..f3fce80b6e 100644
--- a/main/template/jqm/skill/skill_tree_student.tpl
+++ b/main/template/jquery_mobile/skill/skill_tree_student.tpl
@@ -166,7 +166,7 @@ jsPlumb.bind("ready", function() {
 ;(function() {    
     window.jsPlumbDemo = {  	   
         init : function() {
-            console.log('Import defaults');            
+            console.log('Import defaults');
             jsPlumb.Defaults.Anchors = [ "BottomCenter", "TopCenter" ];            
             jsPlumb.Defaults.Container = "skill_tree";
             
@@ -213,4 +213,4 @@ $(document).ready( function() {
         </div>      
         </fieldset>
     </form>    
-</div>
\ No newline at end of file
+</div>
diff --git a/main/template/jqm/skill/skill_wheel.js.tpl b/main/template/jquery_mobile/skill/skill_wheel.js.tpl
similarity index 99%
rename from main/template/jqm/skill/skill_wheel.js.tpl
rename to main/template/jquery_mobile/skill/skill_wheel.js.tpl
index 74de28a41b..d680680988 100644
--- a/main/template/jqm/skill/skill_wheel.js.tpl
+++ b/main/template/jquery_mobile/skill/skill_wheel.js.tpl
@@ -1,5 +1,5 @@
 {# topbar #}
-{% include "default/layout/topbar.tpl" %}
+{% include "jquery_mobile/layout/topbar.tpl" %}
 <script>
 
 /* Skill wheel settings */
diff --git a/main/template/jqm/skill/skill_wheel.tpl b/main/template/jquery_mobile/skill/skill_wheel.tpl
similarity index 99%
rename from main/template/jqm/skill/skill_wheel.tpl
rename to main/template/jquery_mobile/skill/skill_wheel.tpl
index adbdcb045f..c204abb40e 100644
--- a/main/template/jqm/skill/skill_wheel.tpl
+++ b/main/template/jquery_mobile/skill/skill_wheel.tpl
@@ -1,4 +1,4 @@
-{% include 'default/skill/skill_wheel.js.tpl' %}
+{% include 'jquery_mobile/skill/skill_wheel.js.tpl' %}
 
 <script>
 
@@ -562,4 +562,4 @@ $(document).ready(function() {
             </div>  
         </fieldset>
     </form>    
-</div>
\ No newline at end of file
+</div>
diff --git a/main/template/jqm/skill/skill_wheel_student.tpl b/main/template/jquery_mobile/skill/skill_wheel_student.tpl
similarity index 99%
rename from main/template/jqm/skill/skill_wheel_student.tpl
rename to main/template/jquery_mobile/skill/skill_wheel_student.tpl
index 6253e46561..347683d600 100644
--- a/main/template/jqm/skill/skill_wheel_student.tpl
+++ b/main/template/jquery_mobile/skill/skill_wheel_student.tpl
@@ -1,4 +1,4 @@
-{% include 'default/skill/skill_wheel.js.tpl' %}
+{% include 'jquery_mobile/skill/skill_wheel.js.tpl' %}
 
 <script>
  
diff --git a/main/template/jqm/skill/user_skills.tpl b/main/template/jquery_mobile/skill/user_skills.tpl
similarity index 100%
rename from main/template/jqm/skill/user_skills.tpl
rename to main/template/jquery_mobile/skill/user_skills.tpl
diff --git a/main/template/jqm/userportal/course_item.tpl b/main/template/jquery_mobile/userportal/course_item.tpl
similarity index 100%
rename from main/template/jqm/userportal/course_item.tpl
rename to main/template/jquery_mobile/userportal/course_item.tpl
diff --git a/main/template/jquery_mobile/userportal/course_page.tpl b/main/template/jquery_mobile/userportal/course_page.tpl
new file mode 100644
index 0000000000..1b5089bef5
--- /dev/null
+++ b/main/template/jquery_mobile/userportal/course_page.tpl
@@ -0,0 +1,2 @@
+{% extends "jquery_mobile/layout/layout_2_col.tpl" %}
+
diff --git a/main/template/jquery_mobile/userportal/index.tpl b/main/template/jquery_mobile/userportal/index.tpl
new file mode 100644
index 0000000000..5eb8996553
--- /dev/null
+++ b/main/template/jquery_mobile/userportal/index.tpl
@@ -0,0 +1 @@
+{% extends "jquery_mobile/layout/layout_2_col.tpl" %}
diff --git a/main/template/jqm/work/view.tpl b/main/template/jquery_mobile/work/view.tpl
similarity index 100%
rename from main/template/jqm/work/view.tpl
rename to main/template/jquery_mobile/work/view.tpl