190 files changed, 229 insertions, 6415 deletions

diff --git a/.gitignore b/.gitignore
index ea85a39e61..753551f750 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,9 @@ documentation
 favicon.ico
 logs
 plugins/*.zip
-themes/logo-header.png
-themes/logo.png
+misc/user/logo-header.png
+misc/user/logo.png
+misc/user/logo.svg
 piwik-min.js
 robots.txt
 tmp
diff --git a/core/Piwik.php b/core/Piwik.php
index 6d823714fd..82e292fb6f 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -561,7 +561,7 @@ class Piwik
             '/js'      => $allowAny,
             '/libs'    => $denyDirectPhp . $allowStaticAssets,
             '/plugins' => $denyDirectPhp . $allowStaticAssets,
-            '/themes'  => $denyDirectPhp . $allowStaticAssets,
+            '/misc/user'  => $denyDirectPhp . $allowStaticAssets,
         );
         foreach ($directoriesToProtect as $directoryToProtect => $content) {
             Piwik_Common::createHtAccess(PIWIK_INCLUDE_PATH . $directoryToProtect, $overwrite = true, $content);
diff --git a/core/ReportRenderer/Html.php b/core/ReportRenderer/Html.php
index 4301fd2aa5..7eecc497aa 100644
--- a/core/ReportRenderer/Html.php
+++ b/core/ReportRenderer/Html.php
@@ -78,13 +78,13 @@ class Piwik_ReportRenderer_Html extends Piwik_ReportRenderer
 
     private function epilogue()
     {
-        $view = new Piwik_View('@CoreHome/html_report_footer');
+        $view = new Piwik_View('@CoreHome/ReportRenderer/_htmlReportFooter');
         $this->rendering .= $view->render();
     }
 
     public function renderFrontPage($reportTitle, $prettyDate, $description, $reportMetadata, $segment)
     {
-        $frontPageView = new Piwik_View('@CoreHome/html_report_header');
+        $frontPageView = new Piwik_View('@CoreHome/ReportRenderer/_htmlReportHeader');
         $this->assignCommonParameters($frontPageView);
 
         // todo rename 'websiteName' to 'reportTitle' once branch twig is merged
@@ -121,7 +121,7 @@ class Piwik_ReportRenderer_Html extends Piwik_ReportRenderer
 
     public function renderReport($processedReport)
     {
-        $reportView = new Piwik_View('@CoreHome/html_report_body');
+        $reportView = new Piwik_View('@CoreHome/ReportRenderer/_htmlReportBody');
         $this->assignCommonParameters($reportView);
 
         $reportMetadata = $processedReport['metadata'];
diff --git a/core/View.php b/core/View.php
index 18d3002e77..0f3c4c0f7e 100644
--- a/core/View.php
+++ b/core/View.php
@@ -210,7 +210,7 @@ class Piwik_View implements Piwik_View_Interface
      */
     static public function singleReport($title, $reportHtml, $fetch = false)
     {
-        $view = new Piwik_View('@CoreHome/single_report');
+        $view = new Piwik_View('@CoreHome/_singleReport');
         $view->title = $title;
         $view->report = $reportHtml;
 
diff --git a/core/View/ReportsByDimension.php b/core/View/ReportsByDimension.php
index a13ee95bb7..39da988de2 100644
--- a/core/View/ReportsByDimension.php
+++ b/core/View/ReportsByDimension.php
@@ -10,7 +10,7 @@
  */
 
 /**
- * A facade that makes it easier to use the 'reports_by_dimension.tpl' template.
+ * A facade that makes it easier to use the '_reportsByDimension.twig' template.
  *
  * This view will output HTML that displays a list of report names by category and
  * loads them by AJAX when clicked. The loaded report is displayed to the right
@@ -23,7 +23,7 @@ class Piwik_View_ReportsByDimension extends Piwik_View
      */
     public function __construct()
     {
-        parent::__construct('@CoreHome/reports_by_dimension');
+        parent::__construct('@CoreHome/ReportsByDimension/_reportsByDimension');
         $this->dimensionCategories = array();
     }
 
diff --git a/core/ViewDataTable/Cloud.php b/core/ViewDataTable/Cloud.php
index be44984756..517a326a09 100644
--- a/core/ViewDataTable/Cloud.php
+++ b/core/ViewDataTable/Cloud.php
@@ -46,7 +46,7 @@ class Piwik_ViewDataTable_Cloud extends Piwik_ViewDataTable
             $currentControllerAction,
             $apiMethodToRequestDataTable,
             $controllerActionCalledWhenRequestSubTable);
-        $this->dataTableTemplate = '@CoreHome/cloud';
+        $this->dataTableTemplate = '@CoreHome/_dataTableCloud';
         $this->disableOffsetInformation();
         $this->disableExcludeLowPopulation();
     }
diff --git a/core/ViewDataTable/GenerateGraphHTML.php b/core/ViewDataTable/GenerateGraphHTML.php
index 7db2a78fdc..39dd0bf167 100644
--- a/core/ViewDataTable/GenerateGraphHTML.php
+++ b/core/ViewDataTable/GenerateGraphHTML.php
@@ -48,7 +48,7 @@ abstract class Piwik_ViewDataTable_GenerateGraphHTML extends Piwik_ViewDataTable
             $apiMethodToRequestDataTable,
             $controllerActionCalledWhenRequestSubTable);
 
-        $this->dataTableTemplate = '@CoreHome/graph';
+        $this->dataTableTemplate = '@CoreHome/_dataTableGraph';
 
         $this->disableOffsetInformationAndPaginationControls();
         $this->disableExcludeLowPopulation();
diff --git a/core/ViewDataTable/HtmlTable.php b/core/ViewDataTable/HtmlTable.php
index 44cbbfcdca..f1b2cca44c 100644
--- a/core/ViewDataTable/HtmlTable.php
+++ b/core/ViewDataTable/HtmlTable.php
@@ -50,7 +50,7 @@ class Piwik_ViewDataTable_HtmlTable extends Piwik_ViewDataTable
             $currentControllerAction,
             $apiMethodToRequestDataTable,
             $controllerActionCalledWhenRequestSubTable);
-        $this->dataTableTemplate = '@CoreHome/datatable';
+        $this->dataTableTemplate = '@CoreHome/_dataTable';
         $this->variablesDefault['enable_sort'] = '1';
         $this->setSortedColumn('nb_visits', 'desc');
         $this->setLimit(Piwik_Config::getInstance()->General['datatable_default_limit']);
diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php
index 97cdeea7af..210fea76a8 100644
--- a/core/testMinimumPhpVersion.php
+++ b/core/testMinimumPhpVersion.php
@@ -77,8 +77,8 @@ if (!function_exists('Piwik_ExitWithMessage')) {
                             <li><a target="_blank" href="http://demo.piwik.org">Piwik Online Demo</a></li>
                             </ul>';
         }
-        $headerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/templates/simple_structure_header.tpl');
-        $footerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/templates/simple_structure_footer.tpl');
+        $headerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/templates/simpleLayoutHeader.tpl');
+        $footerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/templates/simpleLayoutFooter.tpl');
 
         $headerPage = str_replace('{$HTML_TITLE}', 'Piwik &rsaquo; Error', $headerPage);
         $content = '<p>' . $message . '</p>
diff --git a/lang/de.php b/lang/de.php
index f0c22f807a..9f8e623ec1 100644
--- a/lang/de.php
+++ b/lang/de.php
@@ -492,7 +492,7 @@ $translations = array(
 	'CoreAdminHome_UseCustomLogo' => 'Eigenes Logo verwenden',
 	'CoreAdminHome_LogoUpload' => 'Wählen Sie ein Logo für den Upload',
 	'CoreAdminHome_LogoUploadDescription' => 'Es werden Logos in %s Formaten, ohne Transparenz und mit einer minimalen Höhe von %s Pixeln unterstützt.',
-	'CoreAdminHome_LogoNotWriteable' => 'Um ein eigenes Logo in Piwik verwenden zu können, wird Schreibzugriff auf die Logo Dateien im themes Ordner benötigt: %s',
+	'CoreAdminHome_LogoNotWriteable' => 'Um ein eigenes Logo in Piwik verwenden zu können, wird Schreibzugriff auf die Logo Dateien im "misc" Ordner benötigt: %s',
 	'CoreAdminHome_TrustedHostSettings' => 'Vertrauter Piwik Hostname',
 	'CoreAdminHome_TrustedHostConfirm' => 'Wollen Sie wirklich den Vertrauten Piwik Hostnamen ändern?',
 	'CoreAdminHome_PiwikIsInstalledAt' => 'Piwik ist installiert unter',
diff --git a/lang/en.php b/lang/en.php
index a43b45f892..97cc61f32f 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -492,7 +492,7 @@ $translations = array(
     'CoreAdminHome_UseCustomLogo'                                       => 'Use a custom logo',
     'CoreAdminHome_LogoUpload'                                          => 'Select a Logo to upload',
     'CoreAdminHome_LogoUploadDescription'                               => 'Please upload a file in %s formats, no transparent background, with a minimum height of %s pixels.',
-    'CoreAdminHome_LogoNotWriteable'                                    => 'To use a custom logo Piwik requires write access to the logo files within the themes directory: %s',
+    'CoreAdminHome_LogoNotWriteable'                                    => 'To use a custom logo Piwik requires write access to the logo files within the "misc" directory: %s',
     'CoreAdminHome_TrustedHostSettings'                                 => 'Trusted Piwik Hostname',
     'CoreAdminHome_TrustedHostConfirm'                                  => 'Are you sure you want to change the trusted Piwik hostname?',
     'CoreAdminHome_PiwikIsInstalledAt'                                  => 'Piwik is installed at',
diff --git a/lang/hu.php b/lang/hu.php
index 4db2bb56b5..fafd175d17 100644
--- a/lang/hu.php
+++ b/lang/hu.php
@@ -351,7 +351,7 @@ $translations = array(
 	'CoreAdminHome_CustomLogoFeedbackInfo' => 'A Piwik logó konfigurálása esetén érdekes lehet a felső menüben található %s link eltávolítása is. Ehhez a %sBővítmények%s oldalon ki kell kapcsolni a Feedback bővítményt.',
 	'CoreAdminHome_LogoUpload' => 'Feltölteni kívánt logó:',
 	'CoreAdminHome_LogoUploadDescription' => 'Kérlek %s formátumú, nem átlátszó hátterű és legfeljebb %s pixel magas képet tölts fel.',
-	'CoreAdminHome_LogoNotWriteable' => 'Egyéni logó használatához a Piwiknek írási jogra van szüksége a \'themes\' mappában a logó fájlokhoz: %s',
+	'CoreAdminHome_LogoNotWriteable' => 'Egyéni logó használatához a Piwiknek írási jogra van szüksége a "misc" mappában a logó fájlokhoz: %s',
 	'CoreHome_PluginDescription' => 'Webanalitikai jelentések struktúrája',
 	'CoreHome_WebAnalyticsReports' => 'Webanalitikai jelentések',
 	'CoreHome_NoPrivilegesAskPiwikAdmin' => '\'%s\' felhasználóként léptél be, de úgy tűnik, hogy nem rendelkezel semmilyen jogosultsággal. %s Kérd meg a Piwik adminisztrátorod (kattints ide egy email írásához)%s, hogy adjon számodra \'megtekintési\' jogosultságot a webhelyhez.',
diff --git a/lang/nl.php b/lang/nl.php
index 255e6c18ee..d1be8d1c98 100644
--- a/lang/nl.php
+++ b/lang/nl.php
@@ -451,7 +451,7 @@ $translations = array(
 	'CoreAdminHome_UseCustomLogo' => 'Gebruik een aangepast logo',
 	'CoreAdminHome_LogoUpload' => 'Selecteer een logo om te uploaden',
 	'CoreAdminHome_LogoUploadDescription' => 'Upload een bestand in de formaten %s, geen transparante achtergrond, met een minimum hoogte van %s pixels.',
-	'CoreAdminHome_LogoNotWriteable' => 'Voor het gebruik van een aangepast logo heeft Piwik schrijfrechten nodig in de map met de logo-bestanden in de themes map: %s',
+	'CoreAdminHome_LogoNotWriteable' => 'Voor het gebruik van een aangepast logo heeft Piwik schrijfrechten nodig in de map met de logo-bestanden in de "misc" map: %s',
 	'CoreAdminHome_TrustedHostSettings' => 'Toegestane Piwik hostnaam',
 	'CoreAdminHome_PiwikIsInstalledAt' => 'Piwik is geïnstalleerd in',
 	'CoreAdminHome_JSTracking_MergeSubdomains' => 'Volg bezoekers op elk subdomein van',
diff --git a/misc/user/.gitkeep b/misc/user/.gitkeep
new file mode 100755
index 0000000000..e69de29bb2
--- /dev/null
+++ b/misc/user/.gitkeep
diff --git a/plugins/API/API.php b/plugins/API/API.php
index 3d8d5fa319..9521b971ef 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -315,9 +315,9 @@ class Piwik_API_API
     {
         $logo = 'plugins/Zeitgeist/images/logo.png';
         if (Piwik_Config::getInstance()->branding['use_custom_logo'] == 1
-            && file_exists(Piwik_Common::getPathToPiwikRoot() . '/themes/logo.png')
+            && file_exists(Piwik_Common::getPathToPiwikRoot() . '/misc/user/logo.png')
         ) {
-            $logo = 'themes/logo.png';
+            $logo = 'misc/user/logo.png';
         }
         if (!$pathOnly) {
             return Piwik::getPiwikUrl() . $logo;
@@ -335,9 +335,9 @@ class Piwik_API_API
     {
         $logo = 'plugins/Zeitgeist/images/logo-header.png';
         if (Piwik_Config::getInstance()->branding['use_custom_logo'] == 1
-            && file_exists(Piwik_Common::getPathToPiwikRoot() . '/themes/logo-header.png')
+            && file_exists(Piwik_Common::getPathToPiwikRoot() . '/misc/user/logo-header.png')
         ) {
-            $logo = 'themes/logo-header.png';
+            $logo = 'misc/user/logo-header.png';
         }
         if (!$pathOnly) {
             return Piwik::getPiwikUrl() . $logo;
@@ -356,9 +356,9 @@ class Piwik_API_API
     {
         $logo = 'plugins/Zeitgeist/images/logo.svg';
         if (Piwik_Config::getInstance()->branding['use_custom_logo'] == 1
-            && file_exists(Piwik_Common::getPathToPiwikRoot() . '/themes/logo.svg')
+            && file_exists(Piwik_Common::getPathToPiwikRoot() . '/misc/user/logo.svg')
         ) {
-            $logo = 'themes/logo.svg';
+            $logo = 'misc/user/logo.svg';
         }
         if (!$pathOnly) {
             return Piwik::getPiwikUrl() . $logo;
@@ -377,7 +377,7 @@ class Piwik_API_API
             /* We always have our application logo */
             return true;
         } else if (Piwik_Config::getInstance()->branding['use_custom_logo'] == 1
-            && file_exists(Piwik_Common::getPathToPiwikRoot() . '/themes/logo.svg')
+            && file_exists(Piwik_Common::getPathToPiwikRoot() . '/misc/user/logo.svg')
         ) {
             return true;
         }
diff --git a/plugins/API/templates/listAllAPI.twig b/plugins/API/templates/listAllAPI.twig
index 9863e00ceb..0b1b76000f 100644
--- a/plugins/API/templates/listAllAPI.twig
+++ b/plugins/API/templates/listAllAPI.twig
@@ -6,7 +6,7 @@
 {% block content %}
 <div class="page_api">
     <div class="top_controls_inner">
-        {% include "@CoreHome/period_select.twig" %}
+        {% include "@CoreHome/_periodSelect.twig" %}
     </div>
 
     <h2>{{ 'API_QuickDocumentationTitle'|translate }}</h2>
diff --git a/plugins/Actions/Controller.php b/plugins/Actions/Controller.php
index 3e01c54bb1..69e1f5c6e4 100644
--- a/plugins/Actions/Controller.php
+++ b/plugins/Actions/Controller.php
@@ -452,13 +452,13 @@ class Piwik_Actions_Controller extends Piwik_Controller
      */
     protected function configureGenericViewActions($view)
     {
-        $view->setTemplate('@CoreHome/datatable_actions');
+        $view->setTemplate('@CoreHome/_dataTableActions');
         if (Piwik_Common::getRequestVar('idSubtable', -1) != -1) {
-            $view->setTemplate('@CoreHome/datatable_actions_subdatable');
+            $view->setTemplate('@CoreHome/_dataTableActions_subDataTable');
         }
         $currentlySearching = $view->setSearchRecursive();
         if ($currentlySearching) {
-            $view->setTemplate('@CoreHome/datatable_actions_recursive');
+            $view->setTemplate('@CoreHome/_dataTableActions_recursive');
         }
         // disable Footer icons
         $view->disableShowAllViewsIcons();
diff --git a/plugins/Annotations/Controller.php b/plugins/Annotations/Controller.php
index 295f2fb949..3b88fadb9d 100755
--- a/plugins/Annotations/Controller.php
+++ b/plugins/Annotations/Controller.php
@@ -55,7 +55,7 @@ class Piwik_Annotations_Controller extends Piwik_Controller
         }
 
         // create & render the view
-        $view = new Piwik_View('@Annotations/annotationManager');
+        $view = new Piwik_View('@Annotations/getAnnotationManager');
 
         $allAnnotations = Piwik_API_Request::processRequest(
             'Annotations.getAll', array('date' => $date, 'period' => $period, 'lastN' => $lastN));
@@ -103,7 +103,7 @@ class Piwik_Annotations_Controller extends Piwik_Controller
         if ($_SERVER["REQUEST_METHOD"] == "POST") {
             $this->checkTokenInUrl();
 
-            $view = new Piwik_View('@Annotations//annotation');
+            $view = new Piwik_View('@Annotations/saveAnnotation');
 
             // NOTE: permissions checked in API method
             // save the annotation
@@ -208,7 +208,7 @@ class Piwik_Annotations_Controller extends Piwik_Controller
             "Annotations.getAnnotationCountForDates", array('getAnnotationText' => 1));
 
         // create & render the view
-        $view = new Piwik_View('@Annotations/evolutionAnnotations');
+        $view = new Piwik_View('@Annotations/getEvolutionIcons');
         $view->annotationCounts = reset($annotationCounts); // only one idSite allowed for this action
 
         echo $view->render();
diff --git a/plugins/Annotations/templates/annotation.twig b/plugins/Annotations/templates/_annotation.twig
index e3e879c403..e3e879c403 100755
--- a/plugins/Annotations/templates/annotation.twig
+++ b/plugins/Annotations/templates/_annotation.twig
diff --git a/plugins/Annotations/templates/annotations.twig b/plugins/Annotations/templates/_annotationList.twig
index 72f5c93ca5..f3820ab833 100755
--- a/plugins/Annotations/templates/annotations.twig
+++ b/plugins/Annotations/templates/_annotationList.twig
@@ -6,7 +6,7 @@
 
     <table>
         {% for annotation in annotations %}
-            {% include "@Annotations/annotation.twig" %}
+            {% include "@Annotations/_annotation.twig" %}
         {% endfor %}
         <tr class="new-annotation-row" style="display:none" data-date="{{ startDate }}">
             <td class="annotation-meta">
diff --git a/plugins/Annotations/templates/annotationManager.twig b/plugins/Annotations/templates/getAnnotationManager.twig
index 8cd93e2b10..cea1d7e2ac 100755
--- a/plugins/Annotations/templates/annotationManager.twig
+++ b/plugins/Annotations/templates/getAnnotationManager.twig
@@ -10,7 +10,7 @@
     <div class="annotation-list-range">{{ startDatePretty }}{% if startDate != endDate %} &mdash; {{ endDatePretty }}{% endif %}</div>
 
     <div class="annotation-list">
-        {% include "@Annotations/annotations.twig" %}
+        {% include "@Annotations/_annotationList.twig" %}
 
         <span class="loadingPiwik" style="display:none"><img src="plugins/Zeitgeist/images/loading-blue.gif"/>{{ 'General_Loading_js'|translate }}</span>
 
diff --git a/plugins/Annotations/templates/evolutionAnnotations.twig b/plugins/Annotations/templates/getEvolutionIcons.twig
index f2475c2416..f2475c2416 100755
--- a/plugins/Annotations/templates/evolutionAnnotations.twig
+++ b/plugins/Annotations/templates/getEvolutionIcons.twig
diff --git a/plugins/Annotations/templates/saveAnnotation.twig b/plugins/Annotations/templates/saveAnnotation.twig
new file mode 100644
index 0000000000..e5cd120205
--- /dev/null
+++ b/plugins/Annotations/templates/saveAnnotation.twig
@@ -0,0 +1 @@
+{% include "@Annotations/_annotation.twig" %}
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
index d9bf99b606..a4638beaa3 100644
--- a/plugins/CoreAdminHome/Controller.php
+++ b/plugins/CoreAdminHome/Controller.php
@@ -54,8 +54,10 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
 
             $view->branding = $config->branding;
 
-            $directoryWritable = is_writable(PIWIK_DOCUMENT_ROOT . '/themes/');
-            $logoFilesWriteable = is_writeable(PIWIK_DOCUMENT_ROOT . '/themes/logo.png') && is_writeable(PIWIK_DOCUMENT_ROOT . '/themes/logo-header.png');
+            $directoryWritable = is_writable(PIWIK_DOCUMENT_ROOT . '/misc/user/');
+            $logoFilesWriteable = is_writeable(PIWIK_DOCUMENT_ROOT . '/misc/user/logo.png')
+                && is_writeable(PIWIK_DOCUMENT_ROOT . '/misc/user/logo.svg')
+                && is_writeable(PIWIK_DOCUMENT_ROOT . '/misc/user/logo-header.png');;
             $view->logosWriteable = ($logoFilesWriteable || $directoryWritable) && ini_get('file_uploads') == 1;
 
             $trustedHosts = array();
@@ -127,7 +129,7 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
      */
     public function trackingCodeGenerator()
     {
-        $view = new Piwik_View('@CoreAdminHome/jsTrackingGenerator');
+        $view = new Piwik_View('@CoreAdminHome/trackingCodeGenerator');
         $this->setBasicVariablesView($view);
         $view->topMenu = Piwik_GetTopMenu();
         $view->menu = Piwik_GetAdminMenu();
@@ -224,8 +226,8 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
         imagecopyresized($logo, $image, 0, 0, 0, 0, $widthExpected, self::LOGO_HEIGHT, $width, $height);
         imagecopyresized($logoSmall, $image, 0, 0, 0, 0, $smallWidthExpected, self::LOGO_SMALL_HEIGHT, $width, $height);
 
-        imagepng($logo, PIWIK_DOCUMENT_ROOT . '/themes/logo.png', 3);
-        imagepng($logoSmall, PIWIK_DOCUMENT_ROOT . '/themes/logo-header.png', 3);
+        imagepng($logo, PIWIK_DOCUMENT_ROOT . '/misc/user/logo.png', 3);
+        imagepng($logoSmall, PIWIK_DOCUMENT_ROOT . '/misc/user/logo-header.png', 3);
         echo '1';
         return;
     }
diff --git a/plugins/CoreAdminHome/templates/menu.twig b/plugins/CoreAdminHome/templates/_menu.twig
index 1a4bc9a33c..1a4bc9a33c 100644
--- a/plugins/CoreAdminHome/templates/menu.twig
+++ b/plugins/CoreAdminHome/templates/_menu.twig
diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig
index 430dc195c9..cbc8d1743a 100644
--- a/plugins/CoreAdminHome/templates/generalSettings.twig
+++ b/plugins/CoreAdminHome/templates/generalSettings.twig
@@ -229,11 +229,11 @@
                         </td>
                         <td style='width:200px'>
                             <input name="customLogo" type="file" id="customLogo"/>
-                            <img src="themes/logo.png?r={math equation='rand(10,1000)'}" id="currentLogo" height="150"/>
+                            <img src="misc/user/logo.png?r={math equation='rand(10,1000)'}" id="currentLogo" height="150"/>
                         </td>
                     {% else %}
                         <td>
-                            <span class="ajaxSuccess">{{ 'CoreAdminHome_LogoNotWriteable'|translate("<ul style='list-style: disc inside;'><li>/themes/</li><li>/themes/logo.png</li><li>/themes/logo-header.png</li></ul>")|raw }}</span>
+                            <span class="ajaxSuccess">{{ 'CoreAdminHome_LogoNotWriteable'|translate("<ul style='list-style: disc inside;'><li>/misc/user/</li><li>/misc/user/logo.png</li><li>/misc/user/logo-header.png</li></ul>")|raw }}</span>
                         </td>
                     {% endif %}
                 </tr>
diff --git a/plugins/CoreAdminHome/templates/jsTrackingGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
index 86f07a84d0..f5a8ee7799 100644
--- a/plugins/CoreAdminHome/templates/jsTrackingGenerator.twig
+++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
@@ -26,7 +26,7 @@
     <div>
         {# website #}
         <label class="website-label"><strong>{{ 'General_Website'|translate }}</strong></label>
-        {% include "@CoreHome/sites_selection.twig" with {'siteName':defaultReportSiteName, 'idSite':idSite, 'showAllSitesItem':false, 'switchSiteOnSelect':false,
+        {% include "@CoreHome/_siteSelect.twig" with {'siteName':defaultReportSiteName, 'idSite':idSite, 'showAllSitesItem':false, 'switchSiteOnSelect':false,
         'siteSelectorId':"js-tracker-website", 'showSelectedSite':true} %}
 
         <br/><br/><br/>
@@ -193,7 +193,7 @@
     <div>
         {# website #}
         <label class="website-label"><strong>{{ 'General_Website'|translate }}</strong></label>
-        {% include "@CoreHome/sites_selection.twig" with {
+        {% include "@CoreHome/_siteSelect.twig" with {
             'siteName': defaultReportSiteName, 'idSite': idSite, 'showAllSitesItem': false,
             'switchSiteOnSelect': false, 'showSelectedSite': true, 'siteSelectorId':"image-tracker-website"
         } %}
diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php
index 006cb98f79..724bb1f472 100644
--- a/plugins/CoreHome/Controller.php
+++ b/plugins/CoreHome/Controller.php
@@ -54,7 +54,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller
 
     protected function getDefaultIndexView()
     {
-        $view = new Piwik_View('@CoreHome/index');
+        $view = new Piwik_View('@CoreHome/getDefaultIndexView');
         $this->setGeneralVariablesView($view);
         $view->menu = Piwik_GetMenu();
         $view->content = '';
@@ -136,7 +136,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller
     {
         $rowEvolution = $this->makeRowEvolution($isMulti = false);
         self::$rowEvolutionCache = $rowEvolution;
-        $view = new Piwik_View('popover_rowevolution');
+        $view = new Piwik_View('@CoreHome/getRowEvolutionPopover');
         echo $rowEvolution->renderPopover($this, $view);
     }
 
@@ -145,7 +145,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller
     {
         $rowEvolution = $this->makeRowEvolution($isMulti = true);
         self::$rowEvolutionCache = $rowEvolution;
-        $view = new Piwik_View('@CoreHome/popover_multirowevolution');
+        $view = new Piwik_View('@CoreHome/getMultiRowEvolutionPopover');
         echo $rowEvolution->renderPopover($this, $view);
     }
 
@@ -189,7 +189,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller
         // perform check (but only once every 10s)
         Piwik_UpdateCheck::check($force = false, Piwik_UpdateCheck::UI_CLICK_CHECK_INTERVAL);
 
-        $view = new Piwik_View('@CoreHome/header_message');
+        $view = new Piwik_View('@CoreHome/checkForUpdates');
         $this->setGeneralVariablesView($view);
         echo $view->render();
     }
@@ -199,7 +199,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller
      */
     public function getDonateForm()
     {
-        $view = new Piwik_View('@CoreHome/donate');
+        $view = new Piwik_View('@CoreHome/getDonateForm');
         if (Piwik_Common::getRequestVar('widget', false)
             && Piwik::isUserIsSuperUser()
         ) {
@@ -213,7 +213,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller
      */
     public function getPromoVideo()
     {
-        $view = new Piwik_View('@CoreHome/promo_video');
+        $view = new Piwik_View('@CoreHome/getPromoVideo');
         $view->shareText = Piwik_Translate('CoreHome_SharePiwikShort');
         $view->shareTextLong = Piwik_Translate('CoreHome_SharePiwikLong');
         $view->promoVideoUrl = 'http://www.youtube.com/watch?v=OslfF_EH81g';
diff --git a/plugins/CoreHome/templates/html_report_body.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig
index e06c5a4997..e06c5a4997 100644
--- a/plugins/CoreHome/templates/html_report_body.twig
+++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig
diff --git a/plugins/CoreHome/templates/html_report_footer.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig
index 691287b6e3..691287b6e3 100644
--- a/plugins/CoreHome/templates/html_report_footer.twig
+++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig
diff --git a/plugins/CoreHome/templates/html_report_header.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig
index 0e6879a1c6..0e6879a1c6 100644
--- a/plugins/CoreHome/templates/html_report_header.twig
+++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig
diff --git a/plugins/CoreHome/templates/reports_by_dimension.twig b/plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig
index acea8389b3..acea8389b3 100644
--- a/plugins/CoreHome/templates/reports_by_dimension.twig
+++ b/plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig
diff --git a/plugins/CoreHome/templates/datatable.twig b/plugins/CoreHome/templates/_dataTable.twig
index 2f45a36dad..0411e7dd85 100644
--- a/plugins/CoreHome/templates/datatable.twig
+++ b/plugins/CoreHome/templates/_dataTable.twig
@@ -19,7 +19,7 @@
             {% else %}
                 <a name="{{ properties.uniqueId }}"></a>
                 <table cellspacing="0" class="dataTable">
-                    {% include "@CoreHome/datatable_head.twig" %}
+                    {% include "@CoreHome/_dataTableHead.twig" %}
 
                     <tbody>
                     {% for row in arrayDataTable %}
@@ -27,7 +27,7 @@
                             id="{{ row.idsubdatatable }}"{% endif %}{% if row.issummaryrow is defined and row.issummaryrow and properties.highlight_summary_row %} class="highlight"{% endif %}>
                             {% for column in dataTableColumns %}
                                 <td>
-                                    {% include "@CoreHome/datatable_cell.twig" %}
+                                    {% include "@CoreHome/_dataTableCell.twig" %}
                                 </td>
                             {% endfor %}
                         </tr>
@@ -37,9 +37,9 @@
             {% endif %}
 
             {% if properties.show_footer %}
-                {% include "@CoreHome/datatable_footer.twig" %}
+                {% include "@CoreHome/_dataTableFooter.twig" %}
             {% endif %}
-            {% include "@CoreHome/datatable_js.twig" %}
+            {% include "@CoreHome/_dataTableJS.twig" %}
         {% endif %}
     </div>
 </div>
diff --git a/plugins/CoreHome/templates/datatable_actions.twig b/plugins/CoreHome/templates/_dataTableActions.twig
index fcc8b06f80..cc5988e06a 100644
--- a/plugins/CoreHome/templates/datatable_actions.twig
+++ b/plugins/CoreHome/templates/_dataTableActions.twig
@@ -11,7 +11,7 @@
                 <div class="pk-emptyDataTable">{{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}</div>
             {% else %}
                 <table cellspacing="0" class="dataTable dataTableActions">
-                    {% include "@CoreHome/datatable_head.twig" %}
+                    {% include "@CoreHome/_dataTableHead.twig" %}
 
                     <tbody>
                     {% for row in arrayDataTable %}
@@ -19,7 +19,7 @@
                             {% else %}class="actionsDataTable rowToProcess"{% endif %}>
                             {% for column in dataTableColumns %}
                                 <td>
-                                    {% include "@CoreHome/datatable_cell.twig" with {'column': column, 'row': row} only %}
+                                    {% include "@CoreHome/_dataTableCell.twig" with {'column': column, 'row': row} only %}
                                 </td>
                             {% endfor %}
                         </tr>
@@ -29,9 +29,9 @@
             {% endif %}
 
             {% if properties.show_footer %}
-                {% include "@CoreHome/datatable_footer.twig" %}
+                {% include "@CoreHome/_dataTableFooter.twig" %}
             {% endif %}
-            {% include "@CoreHome/datatable_js.twig" %}
+            {% include "@CoreHome/_dataTableJS.twig" %}
         {% endif %}
     </div>
 </div>
diff --git a/plugins/CoreHome/templates/datatable_actions_recursive.twig b/plugins/CoreHome/templates/_dataTableActions_recursive.twig
index 41a26a5c16..c5935e696d 100644
--- a/plugins/CoreHome/templates/datatable_actions_recursive.twig
+++ b/plugins/CoreHome/templates/_dataTableActions_recursive.twig
@@ -8,7 +8,7 @@
             {% else %}
                 <table cellspacing="0" class="dataTable dataTableActions">
                     
-                    {% include "@CoreHome/datatable_head.twig" %}
+                    {% include "@CoreHome/_dataTableHead.twig" %}
                     
                     <tbody>
                     {% for row in arrayDataTable %}
@@ -16,7 +16,7 @@
                             {% else %}class="actionsDataTable rowToProcess level{$row.level}"{% endif %}>
                             {% for column in dataTableColumns %}
                                 <td>
-                                    {% include "@CoreHome/datatable_cell.twig" %}
+                                    {% include "@CoreHome/_dataTableCell.twig" %}
                                 </td>
                             {% endfor %}
                         </tr>
@@ -26,9 +26,9 @@
             {% endif %}
 
             {% if properties.show_footer %}
-                {% include "@CoreHome/datatable_footer.twig" %}
+                {% include "@CoreHome/_dataTableFooter.twig" %}
             {% endif %}
-            {% include "@CoreHome/datatable_js.twig" %}
+            {% include "@CoreHome/_dataTableJS.twig" %}
         {% endif %}
     </div>
 </div>
diff --git a/plugins/CoreHome/templates/datatable_actions_subdatable.twig b/plugins/CoreHome/templates/_dataTableActions_subDataTable.twig
index a0216893b4..71d7fe7a4d 100644
--- a/plugins/CoreHome/templates/datatable_actions_subdatable.twig
+++ b/plugins/CoreHome/templates/_dataTableActions_subDataTable.twig
@@ -11,7 +11,7 @@
             <tr {% if row.idsubdatatable %}class="subActionsDataTable" id="{{ row.idsubdatatable }}" {% else %}class="actionsDataTable"{% endif %}>
                 {% for column in dataTableColumns %}
                     <td>
-                        {% include "@CoreHome/datatable_cell.twig" with {'column': column} %}
+                        {% include "@CoreHome/_dataTableCell.twig" with {'column': column} %}
                     </td>
                 {% endfor %}
             </tr>
diff --git a/plugins/CoreHome/templates/datatable_cell.twig b/plugins/CoreHome/templates/_dataTableCell.twig
index dab9a6401d..dab9a6401d 100644
--- a/plugins/CoreHome/templates/datatable_cell.twig
+++ b/plugins/CoreHome/templates/_dataTableCell.twig
diff --git a/plugins/CoreHome/templates/cloud.twig b/plugins/CoreHome/templates/_dataTableCloud.twig
index f53bc3ec16..1007628587 100644
--- a/plugins/CoreHome/templates/cloud.twig
+++ b/plugins/CoreHome/templates/_dataTableCloud.twig
@@ -28,7 +28,7 @@
         {% endif %}
     </div>
     {% if properties.show_footer %}
-        {% include "@CoreHome/datatable_footer.twig" %}
+        {% include "@CoreHome/_dataTableFooter.twig" %}
     {% endif %}
-    {% include "@CoreHome/datatable_js.twig" %}
+    {% include "@CoreHome/_dataTableJS.twig" %}
 </div>
diff --git a/plugins/CoreHome/templates/datatable_footer.twig b/plugins/CoreHome/templates/_dataTableFooter.twig
index bf4e932068..bf4e932068 100644
--- a/plugins/CoreHome/templates/datatable_footer.twig
+++ b/plugins/CoreHome/templates/_dataTableFooter.twig
diff --git a/plugins/CoreHome/templates/graph.twig b/plugins/CoreHome/templates/_dataTableGraph.twig
index 87a136a28c..d0012fdca4 100644
--- a/plugins/CoreHome/templates/graph.twig
+++ b/plugins/CoreHome/templates/_dataTableGraph.twig
@@ -32,8 +32,8 @@
         {% endif %}
 
         {% if properties.show_footer %}
-            {% include "@CoreHome/datatable_footer.twig" %}
-            {% include "@CoreHome/datatable_js.twig" %}
+            {% include "@CoreHome/_dataTableFooter.twig" %}
+            {% include "@CoreHome/_dataTableJS.twig" %}
         {% endif %}
     </div>
 </div>
diff --git a/plugins/CoreHome/templates/datatable_head.twig b/plugins/CoreHome/templates/_dataTableHead.twig
index aab08b50aa..aab08b50aa 100644
--- a/plugins/CoreHome/templates/datatable_head.twig
+++ b/plugins/CoreHome/templates/_dataTableHead.twig
diff --git a/plugins/CoreHome/templates/datatable_js.twig b/plugins/CoreHome/templates/_dataTableJS.twig
index 244ee8a17b..244ee8a17b 100644
--- a/plugins/CoreHome/templates/datatable_js.twig
+++ b/plugins/CoreHome/templates/_dataTableJS.twig
diff --git a/plugins/CoreHome/templates/donate.twig b/plugins/CoreHome/templates/_donate.twig
index ad5ad8dee7..ad5ad8dee7 100755
--- a/plugins/CoreHome/templates/donate.twig
+++ b/plugins/CoreHome/templates/_donate.twig
diff --git a/plugins/CoreHome/templates/header_message.twig b/plugins/CoreHome/templates/_headerMessage.twig
index c929db3c03..c929db3c03 100644
--- a/plugins/CoreHome/templates/header_message.twig
+++ b/plugins/CoreHome/templates/_headerMessage.twig
diff --git a/plugins/CoreHome/templates/index_content.twig b/plugins/CoreHome/templates/_indexContent.twig
index 9aea411789..ec4c7cd663 100644
--- a/plugins/CoreHome/templates/index_content.twig
+++ b/plugins/CoreHome/templates/_indexContent.twig
@@ -3,9 +3,9 @@
     <div class="pageWrap">
         <div class="nav_sep"></div>
         <div class="top_controls">
-            {% include "@CoreHome/period_select.twig" %}
+            {% include "@CoreHome/_periodSelect.twig" %}
             {{ postEvent("template_nextToCalendar") }}
-            {% include "@CoreHome/header_message.twig" %}
+            {% include "@CoreHome/_headerMessage.twig" %}
             {{ ajax.requestErrorDiv }}
         </div>
 
diff --git a/plugins/CoreHome/templates/js_disabled_notice.twig b/plugins/CoreHome/templates/_javaScriptDisabled.twig
index fb50e92d56..fb50e92d56 100644
--- a/plugins/CoreHome/templates/js_disabled_notice.twig
+++ b/plugins/CoreHome/templates/_javaScriptDisabled.twig
diff --git a/plugins/CoreHome/templates/logo.twig b/plugins/CoreHome/templates/_logo.twig
index 26ac468aee..26ac468aee 100644
--- a/plugins/CoreHome/templates/logo.twig
+++ b/plugins/CoreHome/templates/_logo.twig
diff --git a/plugins/CoreHome/templates/menu.twig b/plugins/CoreHome/templates/_menu.twig
index 2d8cefed98..2d8cefed98 100644
--- a/plugins/CoreHome/templates/menu.twig
+++ b/plugins/CoreHome/templates/_menu.twig
diff --git a/plugins/CoreHome/templates/period_select.twig b/plugins/CoreHome/templates/_periodSelect.twig
index b0b3b81123..b0b3b81123 100644
--- a/plugins/CoreHome/templates/period_select.twig
+++ b/plugins/CoreHome/templates/_periodSelect.twig
diff --git a/plugins/CoreHome/templates/single_report.twig b/plugins/CoreHome/templates/_singleReport.twig
index f6ad622f21..f6ad622f21 100644
--- a/plugins/CoreHome/templates/single_report.twig
+++ b/plugins/CoreHome/templates/_singleReport.twig
diff --git a/plugins/CoreHome/templates/sites_selection.twig b/plugins/CoreHome/templates/_siteSelect.twig
index d7c904a6c6..d7c904a6c6 100644
--- a/plugins/CoreHome/templates/sites_selection.twig
+++ b/plugins/CoreHome/templates/_siteSelect.twig
diff --git a/plugins/CoreHome/templates/top_bar.twig b/plugins/CoreHome/templates/_topBar.twig
index 5133f0b96f..1a8e94d1ca 100644
--- a/plugins/CoreHome/templates/top_bar.twig
+++ b/plugins/CoreHome/templates/_topBar.twig
@@ -1,13 +1,13 @@
 <div id="topBars">
 
-    {% include "@CoreHome/top_bar_top_menu.twig" %}
-    {% include "@CoreHome/top_bar_hello_menu.twig" %}
+    {% include "@CoreHome/_topBarTopMenu.twig" %}
+    {% include "@CoreHome/_topBarHelloMenu.twig" %}
 
 </div>
 
 {% if showSitesSelection %}
     <div class="top_bar_sites_selector">
         <label>{{ 'General_Website'|translate }}</label>
-        {% include "@CoreHome/sites_selection.twig" %}
+        {% include "@CoreHome/_siteSelect.twig" %}
     </div>
 {% endif %}
diff --git a/plugins/CoreHome/templates/top_bar_hello_menu.twig b/plugins/CoreHome/templates/_topBarHelloMenu.twig
index 5d3fb16a12..5d3fb16a12 100644
--- a/plugins/CoreHome/templates/top_bar_hello_menu.twig
+++ b/plugins/CoreHome/templates/_topBarHelloMenu.twig
diff --git a/plugins/CoreHome/templates/top_bar_top_menu.twig b/plugins/CoreHome/templates/_topBarTopMenu.twig
index 29330720a0..29330720a0 100644
--- a/plugins/CoreHome/templates/top_bar_top_menu.twig
+++ b/plugins/CoreHome/templates/_topBarTopMenu.twig
diff --git a/plugins/CoreHome/templates/_topScreen.twig b/plugins/CoreHome/templates/_topScreen.twig
new file mode 100644
index 0000000000..cdb2b93020
--- /dev/null
+++ b/plugins/CoreHome/templates/_topScreen.twig
@@ -0,0 +1,4 @@
+<div id="header">
+    {% include "@CoreHome/_logo.twig" %}
+    {% include "@CoreHome/_javaScriptDisabled.twig" %}
+</div>
diff --git a/plugins/CoreHome/templates/warning_invalid_host.twig b/plugins/CoreHome/templates/_warningInvalidHost.twig
index 58ec1b397f..58ec1b397f 100644
--- a/plugins/CoreHome/templates/warning_invalid_host.twig
+++ b/plugins/CoreHome/templates/_warningInvalidHost.twig
diff --git a/plugins/CoreHome/templates/checkForUpdates.twig b/plugins/CoreHome/templates/checkForUpdates.twig
new file mode 100644
index 0000000000..c611ae0587
--- /dev/null
+++ b/plugins/CoreHome/templates/checkForUpdates.twig
@@ -0,0 +1 @@
+{% include "@CoreHome/_headerMessage.twig" %}
\ No newline at end of file
diff --git a/plugins/CoreHome/templates/index.twig b/plugins/CoreHome/templates/getDefaultIndexView.twig
index bd0c471200..76725b9ef7 100644
--- a/plugins/CoreHome/templates/index.twig
+++ b/plugins/CoreHome/templates/getDefaultIndexView.twig
@@ -5,10 +5,10 @@
 {% block content %}
 
 {% if (menu is defined and menu) %}
-  {% include "@CoreHome/menu.twig" %}
+  {% include "@CoreHome/_menu.twig" %}
 {% endif %}
 
-{% include "@CoreHome/index_content.twig" %}
+{% include "@CoreHome/_indexContent.twig" %}
 
 {% endblock %}
 
diff --git a/plugins/CoreHome/templates/getDonateForm.twig b/plugins/CoreHome/templates/getDonateForm.twig
new file mode 100644
index 0000000000..1b89eabbea
--- /dev/null
+++ b/plugins/CoreHome/templates/getDonateForm.twig
@@ -0,0 +1 @@
+{% include "@CoreHome/_donate.tpl" %}
\ No newline at end of file
diff --git a/plugins/CoreHome/templates/popover_multirowevolution.twig b/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig
index a4a2a6c704..a4a2a6c704 100644
--- a/plugins/CoreHome/templates/popover_multirowevolution.twig
+++ b/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig
diff --git a/plugins/CoreHome/templates/promo_video.twig b/plugins/CoreHome/templates/getPromoVideo.twig
index e7decbb2bc..e7decbb2bc 100755
--- a/plugins/CoreHome/templates/promo_video.twig
+++ b/plugins/CoreHome/templates/getPromoVideo.twig
diff --git a/plugins/CoreHome/templates/popover_rowevolution.twig b/plugins/CoreHome/templates/getRowEvolutionPopover.twig
index f93089a687..f93089a687 100644
--- a/plugins/CoreHome/templates/popover_rowevolution.twig
+++ b/plugins/CoreHome/templates/getRowEvolutionPopover.twig
diff --git a/plugins/CoreHome/templates/top_screen.twig b/plugins/CoreHome/templates/top_screen.twig
deleted file mode 100644
index f257720525..0000000000
--- a/plugins/CoreHome/templates/top_screen.twig
+++ /dev/null
@@ -1,4 +0,0 @@
-<div id="header">
-    {% include "@CoreHome/logo.twig" %}
-    {% include "@CoreHome/js_disabled_notice.twig" %}
-</div>
diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index db3fe68bac..f4c4898332 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -51,7 +51,7 @@ class Piwik_CorePluginsAdmin_Controller extends Piwik_Controller_Admin
             }
         }
 
-        $view = Piwik_View::factory('@CorePluginsAdmin/manage');
+        $view = new Piwik_View('@CorePluginsAdmin/index');
         $view->pluginsName = $plugins;
         $this->setBasicVariablesView($view);
         $view->menu = Piwik_GetAdminMenu();
diff --git a/plugins/CorePluginsAdmin/templates/manage.twig b/plugins/CorePluginsAdmin/templates/index.twig
index 214a764dc9..214a764dc9 100644
--- a/plugins/CorePluginsAdmin/templates/manage.twig
+++ b/plugins/CorePluginsAdmin/templates/index.twig
diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php
index 387aba3d4b..400b2f65f7 100644
--- a/plugins/CoreUpdater/Controller.php
+++ b/plugins/CoreUpdater/Controller.php
@@ -37,7 +37,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller
 
         $newVersion = $this->checkNewVersionIsAvailableOrDie();
 
-        $view = new Piwik_View('@CoreUpdater/update_new_version_available');
+        $view = new Piwik_View('@CoreUpdater/newVersionAvailable');
         $view->piwik_version = Piwik_Version::VERSION;
         $view->piwik_new_version = $newVersion;
         $view->piwik_latest_version_url = self::getLatestZipUrl($newVersion);
@@ -89,7 +89,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller
         Piwik_API_Request::reloadAuthUsingTokenAuth($_POST);
         Piwik::checkUserIsSuperUser();
 
-        $view = new Piwik_View('@CoreUpdater/update_one_click_results');
+        $view = new Piwik_View('@CoreUpdater/oneClickResults');
         $view->coreError = Piwik_Common::getRequestVar('error', '', 'string', $_POST);
         $view->feedbackMessages = safe_unserialize(Piwik_Common::unsanitizeInputValue(Piwik_Common::getRequestVar('messages', '', 'string', $_POST)));
         echo $view->render();
@@ -236,47 +236,33 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller
 
         $sqlQueries = $updater->getSqlQueriesToExecute();
         if (Piwik_Common::isPhpCliMode()) {
-            if (Piwik_Common::isPhpCliMode()) {
-                $view = new Piwik_View('@CoreUpdater/cli_update_welcome', array(), false);
-            } else {
-                $view = new Piwik_View('@CoreUpdater/update_welcome');
-            }
+            $view = new Piwik_View('@CoreUpdater/runUpdaterAndExit_cli_welcome', array(), false);
             $this->doWelcomeUpdates($view, $componentsWithUpdateFile);
             echo $view->render();
 
             if (!$this->coreError && Piwik::getModule() == 'CoreUpdater') {
-                if (Piwik_Common::isPhpCliMode()) {
-                    $view = new Piwik_View('@CoreUpdater/cli_update_database_done', array(), false);
-                } else {
-                    $view = new Piwik_View('@CoreUpdater/update_database_done');
-                }
+                $view = new Piwik_View('@CoreUpdater/runUpdaterAndExit_cli_done', array(), false);
                 $this->doExecuteUpdates($view, $updater, $componentsWithUpdateFile);
                 echo $view->render();
             }
-        } else if (Piwik_Common::getRequestVar('updateCorePlugins', 0, 'integer') == 1) {
-            $this->warningMessages = array();
-            if (Piwik_Common::isPhpCliMode()) {
-                $view = new Piwik_View('@CoreUpdater/cli_update_database_done', array(), false);
-            } else {
-                $view = new Piwik_View('@CoreUpdater/update_database_done');
-            }
-            $this->doExecuteUpdates($view, $updater, $componentsWithUpdateFile);
+        } else {
+            if (Piwik_Common::getRequestVar('updateCorePlugins', 0, 'integer') == 1) {
+                $this->warningMessages = array();
+                $view = new Piwik_View('@CoreUpdater/runUpdaterAndExit_done');
+                $this->doExecuteUpdates($view, $updater, $componentsWithUpdateFile);
 
-            if (count($sqlQueries) == 1 && !$this->coreError) {
-                Piwik::redirectToModule('CoreHome');
-            }
+                if (count($sqlQueries) == 1 && !$this->coreError) {
+                    Piwik::redirectToModule('CoreHome');
+                }
 
-            echo $view->render();
-        } else {
-            if (Piwik_Common::isPhpCliMode()) {
-                $view = new Piwik_View('@CoreUpdater/cli_update_welcome', array(), false);
+                echo $view->render();
             } else {
-                $view = new Piwik_View('@CoreUpdater/update_welcome');
+                $view = new Piwik_View('@CoreUpdater/runUpdaterAndExit_welcome');
+                $view->queries = $sqlQueries;
+                $view->isMajor = $updater->hasMajorDbUpdate();
+                $this->doWelcomeUpdates($view, $componentsWithUpdateFile);
+                echo $view->render();
             }
-            $view->queries = $sqlQueries;
-            $view->isMajor = $updater->hasMajorDbUpdate();
-            $this->doWelcomeUpdates($view, $componentsWithUpdateFile);
-            echo $view->render();
         }
         exit;
     }
diff --git a/plugins/CoreUpdater/templates/update_new_version_available.twig b/plugins/CoreUpdater/templates/newVersionAvailable.twig
index e87362fe07..e87362fe07 100644
--- a/plugins/CoreUpdater/templates/update_new_version_available.twig
+++ b/plugins/CoreUpdater/templates/newVersionAvailable.twig
diff --git a/plugins/CoreUpdater/templates/update_one_click_results.twig b/plugins/CoreUpdater/templates/oneClickResults.twig
index 3795153608..3795153608 100644
--- a/plugins/CoreUpdater/templates/update_one_click_results.twig
+++ b/plugins/CoreUpdater/templates/oneClickResults.twig
diff --git a/plugins/CoreUpdater/templates/cli_update_database_done.tpl b/plugins/CoreUpdater/templates/runUpdaterAndExit_cli_done.tpl
index 099960be4d..099960be4d 100644
--- a/plugins/CoreUpdater/templates/cli_update_database_done.tpl
+++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_cli_done.tpl
diff --git a/plugins/CoreUpdater/templates/cli_update_welcome.tpl b/plugins/CoreUpdater/templates/runUpdaterAndExit_cli_welcome.tpl
index b3802e024a..b3802e024a 100644
--- a/plugins/CoreUpdater/templates/cli_update_welcome.tpl
+++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_cli_welcome.tpl
diff --git a/plugins/CoreUpdater/templates/update_database_done.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig
index 99ae48b124..917ddaaeba 100644
--- a/plugins/CoreUpdater/templates/update_database_done.twig
+++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig
@@ -68,7 +68,7 @@
     {% else %}
         <p class="success">{{ 'CoreUpdater_PiwikHasBeenSuccessfullyUpgraded'|translate }}</p>
         <div id="donate-form-container">
-            {% include "@CoreHome/donate.tpl" %}
+            {% include "@CoreHome/_donate.tpl" %}
         </div>
     {% endif %}
     <form action="index.php">
diff --git a/plugins/CoreUpdater/templates/update_welcome.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
index b527778939..39f1f00920 100644
--- a/plugins/CoreUpdater/templates/update_welcome.twig
+++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
@@ -96,7 +96,7 @@
     {% endif %}
 {% endif %}
 
-{% include "@Installation/integrityDetails.twig" %}
+{% include "@Installation/_integrityDetails.twig" %}
 
 <style type="text/css">
     code {
diff --git a/plugins/Dashboard/templates/_header.twig b/plugins/Dashboard/templates/_header.twig
index efe4da510a..f9dfba3f4b 100644
--- a/plugins/Dashboard/templates/_header.twig
+++ b/plugins/Dashboard/templates/_header.twig
@@ -9,8 +9,8 @@
     <!--[if lt IE 9]>
     <script language="javascript" type="text/javascript" src="libs/jqplot/excanvas.min.js"></script>
     <![endif]-->
-    {% include "@CoreHome/js_global_variables.twig" %}
-    {% include "@CoreHome/js_css_includes.twig" %}
+    {% include "_jsGlobalVariables.twig" %}
+    {% include "_jsCssIncludes.twig" %}
 
     <style type="text/css">
         body {
diff --git a/plugins/Dashboard/templates/index.twig b/plugins/Dashboard/templates/index.twig
index e2db5d5f50..cc86a56715 100644
--- a/plugins/Dashboard/templates/index.twig
+++ b/plugins/Dashboard/templates/index.twig
@@ -1,6 +1,6 @@
 {% include "@Dashboard/_header.twig" %}
 <div id="menuHead">
-    {% include "@CoreHome/period_select.twig" %}
+    {% include "@CoreHome/_periodSelect.twig" %}
     <div id="Dashboard">
         <ul>
             {% for dashboard in dashboards %}
diff --git a/plugins/Feedback/Controller.php b/plugins/Feedback/Controller.php
index bd61bd4045..7a30d38302 100644
--- a/plugins/Feedback/Controller.php
+++ b/plugins/Feedback/Controller.php
@@ -33,7 +33,7 @@ class Piwik_Feedback_Controller extends Piwik_Controller
         $category = Piwik_Common::getRequestVar('category', '', 'string');
         $nonce = Piwik_Common::getRequestVar('nonce', '', 'string');
 
-        $view = new Piwik_View('@Feedback/sent');
+        $view = new Piwik_View('@Feedback/sendFeedback');
         $view->feedbackEmailAddress = Piwik_Config::getInstance()->General['feedback_email_address'];
         try {
             $minimumBodyLength = 40;
diff --git a/plugins/Feedback/templates/index.twig b/plugins/Feedback/templates/index.twig
index ab26930b98..9ad96bea94 100644
--- a/plugins/Feedback/templates/index.twig
+++ b/plugins/Feedback/templates/index.twig
@@ -46,7 +46,7 @@
 
     <p><strong>{{ 'Feedback_WantToThankConsiderDonating'|translate }}</strong></p>
     <br/>
-    {% include "@CoreHome/donate.twig" with { 'msg':""} %}
+    {% include "@CoreHome/_donate.twig" with { 'msg':""} %}
 </div>
 <div id="feedback-form" style="display:none;">
     <form method="post" action="index.php?module=Feedback&action=sendFeedback">
diff --git a/plugins/Feedback/templates/sent.twig b/plugins/Feedback/templates/sendFeedback.twig
index 38dc79663c..38dc79663c 100644
--- a/plugins/Feedback/templates/sent.twig
+++ b/plugins/Feedback/templates/sendFeedback.twig
diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php
index 62e76be000..bd660f49d5 100644
--- a/plugins/Goals/Controller.php
+++ b/plugins/Goals/Controller.php
@@ -164,8 +164,8 @@ class Piwik_Goals_Controller extends Piwik_Controller
 
     protected function getGoalReportView($idGoal = false)
     {
-        $view = new Piwik_View('@Goals/single_goal');
-        if ($idGoal == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER) {
+        $view = new Piwik_View('@Goals/getGoalReportView');
+        if ($idGoal == Piwik_Archive::LABEL_ECOMMERCE_ORDER) {
             $goalDefinition['name'] = Piwik_Translate('Goals_Ecommerce');
             $goalDefinition['allow_multiple'] = true;
             $ecommerce = $view->ecommerce = true;
@@ -236,7 +236,7 @@ class Piwik_Goals_Controller extends Piwik_Controller
 
     protected function getOverviewView()
     {
-        $view = new Piwik_View('@Goals/overview');
+        $view = new Piwik_View('@Goals/getOverviewView');
         $this->setGeneralVariablesView($view);
 
         $view->graphEvolution = $this->getEvolutionGraph(true, array('nb_conversions'));
@@ -290,7 +290,7 @@ class Piwik_Goals_Controller extends Piwik_Controller
 
     public function addNewGoal()
     {
-        $view = new Piwik_View('@Goals/add_new_goal');
+        $view = new Piwik_View('@Goals/addNewGoal');
         $this->setGeneralVariablesView($view);
         $view->userCanEditGoals = Piwik::isUserHasAdminAccess($this->idSite);
         $view->onlyShowAddNewGoal = true;
diff --git a/plugins/Goals/templates/add_edit_goal.twig b/plugins/Goals/templates/_addEditGoal.twig
index a45b85148a..354076ed0e 100644
--- a/plugins/Goals/templates/add_edit_goal.twig
+++ b/plugins/Goals/templates/_addEditGoal.twig
@@ -39,9 +39,9 @@
 
 <div class="entityContainer">
     {% if onlyShowAddNewGoal is not defined %}
-        {% include "@Goals/list_goal_edit.twig" %}
+        {% include "@Goals/_listGoalEdit.twig" %}
     {% endif %}
-    {% include "@Goals/form_add_goal.twig" %}
+    {% include "@Goals/_formAddGoal.twig" %}
     {% if onlyShowAddNewGoal is not defined %}
         <div class='entityCancel' style='display:none'>
             {{ 'General_OrCancel'|translate("<a class='entityCancelLink'>","</a>") }}
diff --git a/plugins/Goals/templates/form_add_goal.twig b/plugins/Goals/templates/_formAddGoal.twig
index a8ac48b6aa..a8ac48b6aa 100644
--- a/plugins/Goals/templates/form_add_goal.twig
+++ b/plugins/Goals/templates/_formAddGoal.twig
diff --git a/plugins/Goals/templates/list_goal_edit.twig b/plugins/Goals/templates/_listGoalEdit.twig
index af4057483f..af4057483f 100644
--- a/plugins/Goals/templates/list_goal_edit.twig
+++ b/plugins/Goals/templates/_listGoalEdit.twig
diff --git a/plugins/Goals/templates/list_top_dimension.twig b/plugins/Goals/templates/_listTopDimension.twig
index 27e66d3e1e..27e66d3e1e 100644
--- a/plugins/Goals/templates/list_top_dimension.twig
+++ b/plugins/Goals/templates/_listTopDimension.twig
diff --git a/plugins/Goals/templates/title_and_evolution_graph.twig b/plugins/Goals/templates/_titleAndEvolutionGraph.twig
index 3e0d8d8cbd..7fff7829ed 100644
--- a/plugins/Goals/templates/title_and_evolution_graph.twig
+++ b/plugins/Goals/templates/_titleAndEvolutionGraph.twig
@@ -77,5 +77,5 @@
         </div>
     </div>
 {% endif %}
-{% include "@CoreHome/sparkline_footer.twig" %}
+{% include "_sparklineFooter.twig" %}
 
diff --git a/plugins/Goals/templates/add_new_goal.twig b/plugins/Goals/templates/addNewGoal.twig
index f93e1a8077..cb4021c645 100644
--- a/plugins/Goals/templates/add_new_goal.twig
+++ b/plugins/Goals/templates/addNewGoal.twig
@@ -1,5 +1,5 @@
 {% if userCanEditGoals %}
-    {% include "@Goals/add_edit_goal.twig" %}
+    {% include "@Goals/_addEditGoal.twig" %}
 {% else %}
     <h2>{{ 'Goals_CreateNewGOal'|translate }}</h2>
     <p>
diff --git a/plugins/Goals/templates/single_goal.twig b/plugins/Goals/templates/getGoalReportView.twig
index 5b241fcbe0..2f707a3d91 100644
--- a/plugins/Goals/templates/single_goal.twig
+++ b/plugins/Goals/templates/getGoalReportView.twig
@@ -1,5 +1,5 @@
 <link rel="stylesheet" type="text/css" href="plugins/Goals/stylesheets/goals.css"/>
-{% include "@Goals/title_and_evolution_graph.twig" %}
+{% include "@Goals/_titleAndEvolutionGraph.twig" %}
 
 <div class="clear"></div>
 {% if nb_conversions > 0 %}
@@ -7,13 +7,13 @@
     <ul class="ulGoalTopElements">
         {% if ecommerce is not defined}
             {% if topDimensions.country is defined %}
-                <li>{{ 'Goals_BestCountries'|translate }} {% include '@Goals/list_top_dimension.twig' with {'topDimension':topDimensions.country} %}</li>
+                <li>{{ 'Goals_BestCountries'|translate }} {% include '@Goals/_listTopDimension.twig' with {'topDimension':topDimensions.country} %}</li>
             {% endif %}
             {% if topDimensions.keyword is defined and topDimensions.keyword|length > 0 %}
-                <li>{{ 'Goals_BestKeywords'|translate }} {% include '@Goals/list_top_dimension.twig' with {'topDimension':topDimensions.keyword} %}</li>
+                <li>{{ 'Goals_BestKeywords'|translate }} {% include '@Goals/_listTopDimension.twig' with {'topDimension':topDimensions.keyword} %}</li>
             {% endif %}
             {% if topDimensions.website is defined and topDimensions.website|length > 0 %}
-                <li>{{ 'Goals_BestReferers'|translate }} {% include '@Goals/list_top_dimension.twig' with {'topDimension':topDimensions.website} %}</li>
+                <li>{{ 'Goals_BestReferers'|translate }} {% include '@Goals/_listTopDimension.twig' with {'topDimension':topDimensions.website} %}</li>
             {% endif %}
             <li>
                 {{ 'Goals_ReturningVisitorsConversionRateIs'|translate("<strong>"+conversion_rate_returning+"</strong>")|raw }}
diff --git a/plugins/Goals/templates/overview.twig b/plugins/Goals/templates/getOverviewView.twig
index 991663194c..4abb5cdd08 100644
--- a/plugins/Goals/templates/overview.twig
+++ b/plugins/Goals/templates/getOverviewView.twig
@@ -1,6 +1,6 @@
 <link rel="stylesheet" type="text/css" href="plugins/Goals/stylesheets/goals.css"/>
 
-{% include "@Goals/title_and_evolution_graph.twig" %}
+{% include "@Goals/_titleAndEvolutionGraph.twig" %}
 {% set sum_nb_conversions=nb_conversions %}
 
 {% for goal in goalMetrics %}
@@ -45,6 +45,6 @@
     {% endif %}
 
     {% if userCanEditGoals %}
-        {% include "@Goals/add_edit_goal.twig" %}
+        {% include "@Goals/_addEditGoal.twig" %}
     {% endif %}
 {% endif %}
diff --git a/plugins/ImageGraph/Controller.php b/plugins/ImageGraph/Controller.php
index 430e372955..f6b08bf4fd 100644
--- a/plugins/ImageGraph/Controller.php
+++ b/plugins/ImageGraph/Controller.php
@@ -41,7 +41,7 @@ class Piwik_ImageGraph_Controller extends Piwik_Controller
     {
         Piwik::checkUserIsSuperUser();
 
-        $view = new Piwik_View('@ImageGraph/debug_graphs_all_sizes');
+        $view = new Piwik_View('@ImageGraph/testAllSizes');
         $this->setGeneralVariablesView($view);
 
         $period = Piwik_Common::getRequestVar('period', 'day', 'string');
diff --git a/plugins/ImageGraph/templates/debug_graphs_all_sizes.twig b/plugins/ImageGraph/templates/testAllSizes.twig
index 85af6b4f32..99ff2dede4 100644
--- a/plugins/ImageGraph/templates/debug_graphs_all_sizes.twig
+++ b/plugins/ImageGraph/templates/testAllSizes.twig
@@ -7,7 +7,7 @@
     <h2>{{ 'ImageGraph_ImageGraph'|translate }} ::: {{ siteName }}</h2>
 
     <div class="top_controls_inner">
-        {% include '@CoreHome/period_select.twig' %}
+        {% include '@CoreHome/_periodSelect.twig' %}
     </div>
 
     <div class="entityContainer" style="width:100%;">
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index e55e75b3f1..2367abf3de 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -420,7 +420,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin
         $idSite = $this->session->site_idSite;
 
         // Load the Tracking code and help text from the SitesManager
-        $viewTrackingHelp = new Piwik_View('SitesManager/templates/DisplayJavascriptCode.tpl');
+        $viewTrackingHelp = new Piwik_View('@SitesManager/_displayJavascriptCode');
         $viewTrackingHelp->displaySiteName = $siteName;
         $viewTrackingHelp->jsTag = Piwik::getJavascriptCode($idSite, Piwik_Url::getCurrentUrlWithoutFileName());
         $viewTrackingHelp->idSite = $idSite;
diff --git a/plugins/Installation/templates/allSteps.twig b/plugins/Installation/templates/_allSteps.twig
index 7f5f8ba54b..7f5f8ba54b 100644
--- a/plugins/Installation/templates/allSteps.twig
+++ b/plugins/Installation/templates/_allSteps.twig
diff --git a/plugins/Installation/templates/integrityDetails.twig b/plugins/Installation/templates/_integrityDetails.twig
index b285bb46f9..b285bb46f9 100644
--- a/plugins/Installation/templates/integrityDetails.twig
+++ b/plugins/Installation/templates/_integrityDetails.twig
diff --git a/plugins/Installation/templates/systemCheck_legend.twig b/plugins/Installation/templates/_systemCheckLegend.twig
index 04e1c20edf..04e1c20edf 100644
--- a/plugins/Installation/templates/systemCheck_legend.twig
+++ b/plugins/Installation/templates/_systemCheckLegend.twig
diff --git a/plugins/Installation/templates/systemCheckSection.twig b/plugins/Installation/templates/_systemCheckSection.twig
index 9c0de17d00..7ff8da3666 100755
--- a/plugins/Installation/templates/systemCheckSection.twig
+++ b/plugins/Installation/templates/_systemCheckSection.twig
@@ -327,4 +327,4 @@
     </tr>
 </table>
 
-{% include "@Installation/integrityDetails.twig" %}
\ No newline at end of file
+{% include "@Installation/_integrityDetails.twig" %}
\ No newline at end of file
diff --git a/plugins/Installation/templates/databaseCheck.twig b/plugins/Installation/templates/databaseCheck.twig
index 005f5e6198..a65be33046 100644
--- a/plugins/Installation/templates/databaseCheck.twig
+++ b/plugins/Installation/templates/databaseCheck.twig
@@ -1,4 +1,4 @@
-{% extends '@Installation/structure.twig' %}
+{% extends '@Installation/layout.twig' %}
 
 {% block content %}
 {% set ok %}<img src='plugins/Zeitgeist/images/ok.png' />{% endset %}
diff --git a/plugins/Installation/templates/databaseSetup.twig b/plugins/Installation/templates/databaseSetup.twig
index 8afdbb707a..1a4a243693 100644
--- a/plugins/Installation/templates/databaseSetup.twig
+++ b/plugins/Installation/templates/databaseSetup.twig
@@ -1,4 +1,4 @@
-{% extends '@Installation/structure.twig' %}
+{% extends '@Installation/layout.twig' %}
 
 {% block content %}
 <h2>{{ 'Installation_DatabaseSetup'|translate }}</h2>
diff --git a/plugins/Installation/templates/displayJavascriptCode.twig b/plugins/Installation/templates/displayJavascriptCode.twig
index 64fa19be1e..dede2e5a3e 100644
--- a/plugins/Installation/templates/displayJavascriptCode.twig
+++ b/plugins/Installation/templates/displayJavascriptCode.twig
@@ -1,4 +1,4 @@
-{% extends '@Installation/structure.twig' %}
+{% extends '@Installation/layout.twig' %}
 
 {% block content %}
 {% if displayfirstWebsiteSetupSuccess is defined %}
diff --git a/plugins/Installation/templates/finished.twig b/plugins/Installation/templates/finished.twig
index 9e2eb3936a..cf5cdc7494 100644
--- a/plugins/Installation/templates/finished.twig
+++ b/plugins/Installation/templates/finished.twig
@@ -1,4 +1,4 @@
-{% extends '@Installation/structure.twig' %}
+{% extends '@Installation/layout.twig' %}
 
 {% block content %}
 <h2>{{ 'Installation_Congratulations'|translate|raw }}</h2>
diff --git a/plugins/Installation/templates/firstWebsiteSetup.twig b/plugins/Installation/templates/firstWebsiteSetup.twig
index f4a0b1449b..feffadd1d2 100644
--- a/plugins/Installation/templates/firstWebsiteSetup.twig
+++ b/plugins/Installation/templates/firstWebsiteSetup.twig
@@ -1,4 +1,4 @@
-{% extends '@Installation/structure.twig' %}
+{% extends '@Installation/layout.twig' %}
 
 {% block content %}
 {% if displayGeneralSetupSuccess is defined %}
diff --git a/plugins/Installation/templates/generalSetup.twig b/plugins/Installation/templates/generalSetup.twig
index ae96f4b5a4..c22d83d48c 100644
--- a/plugins/Installation/templates/generalSetup.twig
+++ b/plugins/Installation/templates/generalSetup.twig
@@ -1,4 +1,4 @@
-{% extends '@Installation/structure.twig' %}
+{% extends '@Installation/layout.twig' %}
 
 {% block content %}
 <h2>{{ 'Installation_SuperUser'|translate }}</h2>
diff --git a/plugins/Installation/templates/structure.twig b/plugins/Installation/templates/layout.twig
index 897c5f2986..2a61063f1e 100644
--- a/plugins/Installation/templates/structure.twig
+++ b/plugins/Installation/templates/layout.twig
@@ -41,7 +41,7 @@
         <div class="both"></div>
 
         <div id="generalInstall">
-            {% include "@Installation/allSteps.twig" %}
+            {% include "@Installation/_allSteps.twig" %}
         </div>
 
         <div id="detailInstall">
diff --git a/plugins/Installation/templates/systemCheck.twig b/plugins/Installation/templates/systemCheck.twig
index fd798a0558..51dbc46167 100644
--- a/plugins/Installation/templates/systemCheck.twig
+++ b/plugins/Installation/templates/systemCheck.twig
@@ -1,14 +1,14 @@
-{% extends '@Installation/structure.twig' %}
+{% extends '@Installation/layout.twig' %}
 
 {% block content %}
 {% if not showNextStep %}
-    {% include "@Installation/systemCheck_legend.twig" %}
+    {% include "@Installation/_systemCheckLegend.twig" %}
     <br style="clear:both">
 {% endif %}
 
 <h3>{{ 'Installation_SystemCheck'|translate }}</h3>
 <br/>
-{% include "@Installation/systemCheckSection.twig" %}
+{% include "@Installation/_systemCheckSection.twig" %}
 
 {% if not showNextStep %}
     <br/>
@@ -16,6 +16,6 @@
         <img src='plugins/Zeitgeist/images/link.gif'/> &nbsp;
         <a href="?module=Proxy&action=redirect&url=http://piwik.org/docs/requirements/" target="_blank">{{ 'Installation_Requirements'|translate }}</a>
     </p>
-    {% include "@Installation/systemCheck_legend.twig" %}
+    {% include "@Installation/_systemCheckLegend.twig" %}
 {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/plugins/Installation/templates/systemCheckPage.twig b/plugins/Installation/templates/systemCheckPage.twig
index 219e120394..7739f7c72e 100755
--- a/plugins/Installation/templates/systemCheckPage.twig
+++ b/plugins/Installation/templates/systemCheckPage.twig
@@ -15,6 +15,6 @@
             {{ 'Installation_SystemCheckSummaryNoProblems'|translate }}
         {% endif %}
     </p>
-    {% include "@Installation/systemCheckSection.twig" %}
+    {% include "@Installation/_systemCheckSection.twig" %}
 {% endif %}
 {% endblock %}
diff --git a/plugins/Installation/templates/tablesCreation.twig b/plugins/Installation/templates/tablesCreation.twig
index e5f48fc017..f51db570b3 100644
--- a/plugins/Installation/templates/tablesCreation.twig
+++ b/plugins/Installation/templates/tablesCreation.twig
@@ -1,4 +1,4 @@
-{% extends '@Installation/structure.twig' %}
+{% extends '@Installation/layout.twig' %}
 
 {% block content %}
 <h2>{{ 'Installation_Tables'|translate }}</h2>
diff --git a/plugins/Installation/templates/welcome.twig b/plugins/Installation/templates/welcome.twig
index 7eafe56e91..5ded3aa8e6 100644
--- a/plugins/Installation/templates/welcome.twig
+++ b/plugins/Installation/templates/welcome.twig
@@ -1,4 +1,4 @@
-{% extends '@Installation/structure.twig' %}
+{% extends '@Installation/layout.twig' %}
 
 {% block content %}
 <h2>{{ 'Installation_Welcome'|translate }}</h2>
diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php
index 8d54ccf1b4..a0cf7d0039 100644
--- a/plugins/LanguagesManager/LanguagesManager.php
+++ b/plugins/LanguagesManager/LanguagesManager.php
@@ -89,8 +89,7 @@ class Piwik_LanguagesManager extends Piwik_Plugin
      */
     private function getLanguagesSelector()
     {
-        // don't use Piwik_View::factory() here
-        $view = new Piwik_View("@LanguagesManager/languages");
+        $view = new Piwik_View("@LanguagesManager/getLanguagesSelector");
         $view->languages = Piwik_LanguagesManager_API::getInstance()->getAvailableLanguageNames();
         $view->currentLanguageCode = self::getLanguageCodeForCurrentUser();
         $view->currentLanguageName = self::getLanguageNameForCurrentUser();
diff --git a/plugins/LanguagesManager/templates/languages.twig b/plugins/LanguagesManager/templates/getLanguagesSelector.twig
index 96b5b5144c..96b5b5144c 100644
--- a/plugins/LanguagesManager/templates/languages.twig
+++ b/plugins/LanguagesManager/templates/getLanguagesSelector.twig
diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php
index 0d6e1e89d7..2c05998497 100644
--- a/plugins/Live/Controller.php
+++ b/plugins/Live/Controller.php
@@ -38,7 +38,7 @@ class Piwik_Live_Controller extends Piwik_Controller
 
         $lastNData = Piwik_API_Request::processRequest('Live.getCounters', array('lastMinutes' => $lastMinutes));
 
-        $view = new Piwik_View('@Live/simpleLastVisitCount');
+        $view = new Piwik_View('@Live/getSimpleLastVisitCount');
         $view->lastMinutes = $lastMinutes;
         $view->visitors = Piwik::getPrettyNumber($lastNData[0]['visitors']);
         $view->visits = Piwik::getPrettyNumber($lastNData[0]['visits']);
@@ -59,7 +59,7 @@ class Piwik_Live_Controller extends Piwik_Controller
 
     public function ajaxTotalVisitors($fetch = false)
     {
-        $view = new Piwik_View('@Live/totalVisits');
+        $view = new Piwik_View('@Live/ajaxTotalVisitors');
         $view = $this->setCounters($view);
         $view->idSite = $this->idSite;
         return $this->render($view, $fetch);
@@ -83,7 +83,7 @@ class Piwik_Live_Controller extends Piwik_Controller
         );
         $view->disableGenericFilters();
         $view->disableSort();
-        $view->setTemplate("@Live/visitorLog.twig");
+        $view->setTemplate("@Live/getVisitorLog.twig");
         $view->setSortedColumn('idVisit', 'ASC');
         $view->disableSearchBox();
         $view->setLimit(20);
@@ -118,7 +118,7 @@ class Piwik_Live_Controller extends Piwik_Controller
         // hack, ensure we load today's visits by default
         $_GET['date'] = 'today';
         $_GET['period'] = 'day';
-        $view = new Piwik_View('@Live/lastVisits');
+        $view = new Piwik_View('@Live/getLastVisitsStart');
         $view->idSite = $this->idSite;
 
         $api = new Piwik_API_Request("method=Live.getLastVisitsDetails&idSite={$this->idSite}&filter_limit=10&format=php&serialize=0&disable_generic_filters=1");
diff --git a/plugins/Live/templates/totalVisits.twig b/plugins/Live/templates/_totalVisitors.twig
index 40d2d1eed0..40d2d1eed0 100644
--- a/plugins/Live/templates/totalVisits.twig
+++ b/plugins/Live/templates/_totalVisitors.twig
diff --git a/plugins/Live/templates/ajaxTotalVisitors.twig b/plugins/Live/templates/ajaxTotalVisitors.twig
new file mode 100644
index 0000000000..e3f9121941
--- /dev/null
+++ b/plugins/Live/templates/ajaxTotalVisitors.twig
@@ -0,0 +1 @@
+{% include "@Live/_totalVisitors.twig" %}
\ No newline at end of file
diff --git a/plugins/Live/templates/lastVisits.twig b/plugins/Live/templates/getLastVisitsStart.twig
index 8134b7150a..8134b7150a 100644
--- a/plugins/Live/templates/lastVisits.twig
+++ b/plugins/Live/templates/getLastVisitsStart.twig
diff --git a/plugins/Live/templates/simpleLastVisitCount.twig b/plugins/Live/templates/getSimpleLastVisitCount.twig
index 787128922c..787128922c 100644
--- a/plugins/Live/templates/simpleLastVisitCount.twig
+++ b/plugins/Live/templates/getSimpleLastVisitCount.twig
diff --git a/plugins/Live/templates/visitorLog.twig b/plugins/Live/templates/getVisitorLog.twig
index 9303d526c7..8fa38fdba3 100644
--- a/plugins/Live/templates/visitorLog.twig
+++ b/plugins/Live/templates/getVisitorLog.twig
@@ -310,10 +310,10 @@
 {% endif %}
 
     {% if properties.show_footer %}
-        {% include "@CoreHome/datatable_footer.twig" %}
+        {% include "@CoreHome/_dataTableFooter.twig" %}
     {% endif %}
 
-    {% include "@CoreHome/datatable_js.twig"}
+    {% include "@CoreHome/_dataTableJS.twig"}
     <script type="text/javascript" defer="defer">
 
         var visitorLogTitle = '{{ 'Live_VisitorLog'|translate|e('js') }}';
diff --git a/plugins/Live/templates/index.twig b/plugins/Live/templates/index.twig
index 98382fa253..ea6028db27 100644
--- a/plugins/Live/templates/index.twig
+++ b/plugins/Live/templates/index.twig
@@ -25,7 +25,7 @@
     });
 </script>
 
-{% include "@Live/totalVisits.twig" %}
+{% include "@Live/_totalVisitors.twig" %}
 
 {{ visitors|raw }}
 
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index 83e6f374b1..ba3e3cf355 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -75,7 +75,7 @@ class Piwik_Login_Controller extends Piwik_Controller
             }
         }
 
-        $view = Piwik_View::factory('@Login/login');
+        $view = new Piwik_View('@Login/login');
         $view->AccessErrorString = $messageNoAccess;
         $view->infoMessage = nl2br($infoMessage);
         $view->addForm($form);
@@ -191,7 +191,7 @@ class Piwik_Login_Controller extends Piwik_Controller
             $formErrors = $formData['errors'];
         }
 
-        $view = Piwik_View::factory('message');
+        $view = new Piwik_View('@Login/resetPassword');
         $view->infoMessage = $infoMessage;
         $view->formErrors = $formErrors;
         echo $view->render();
diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig
index a346ce4650..d699e17a6c 100644
--- a/plugins/Login/templates/login.twig
+++ b/plugins/Login/templates/login.twig
@@ -33,10 +33,10 @@
     {% if 'General_LayoutDirection'|translate =='rtl' %}
     <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/rtl.css"/>
     {% endif %}
-    {% include "@CoreHome/iframe_buster_header.twig" %}
+    {% include "_iframeBusterHeader.twig" %}
 </head>
 <body class="login">
-{% include "@CoreHome/iframe_buster_body.twig" %}
+{% include "_iframeBusterBody.twig" %}
 <div id="logo">
     {% if isCustomLogo == false %}<a href="http://piwik.org" title="{{ linkTitle }}">{% endif %}
     {% if hasSVGLogo %}
diff --git a/plugins/Login/templates/message.twig b/plugins/Login/templates/resetPassword.twig
index eaa5be0a8d..eaa5be0a8d 100755
--- a/plugins/Login/templates/message.twig
+++ b/plugins/Login/templates/resetPassword.twig
diff --git a/plugins/MobileMessaging/Controller.php b/plugins/MobileMessaging/Controller.php
index b4e99c3242..01c3d731e0 100644
--- a/plugins/MobileMessaging/Controller.php
+++ b/plugins/MobileMessaging/Controller.php
@@ -28,7 +28,7 @@ class Piwik_MobileMessaging_Controller extends Piwik_Controller_Admin
     {
         Piwik::checkUserIsNotAnonymous();
 
-        $view = new Piwik_View('@MobileMessaging/Settings');
+        $view = new Piwik_View('@MobileMessaging/index');
 
         $view->isSuperUser = Piwik::isUserIsSuperUser();
 
diff --git a/plugins/MobileMessaging/MobileMessaging.php b/plugins/MobileMessaging/MobileMessaging.php
index cbd303af0f..1235be46c3 100644
--- a/plugins/MobileMessaging/MobileMessaging.php
+++ b/plugins/MobileMessaging/MobileMessaging.php
@@ -273,7 +273,7 @@ class Piwik_MobileMessaging extends Piwik_Plugin
         }
 
         $out =& $notification->getNotificationObject();
-        $view = Piwik_View::factory('@MobileMessaging/ReportParameters');
+        $view = new Piwik_View('@MobileMessaging/reportParametersPDFReports');
         $view->reportType = self::MOBILE_TYPE;
         $view->phoneNumbers = Piwik_MobileMessaging_API::getInstance()->getActivatedPhoneNumbers();
         $out .= $view->render();
diff --git a/plugins/MobileMessaging/templates/Settings.twig b/plugins/MobileMessaging/templates/index.twig
index adbd93d2bf..adbd93d2bf 100644
--- a/plugins/MobileMessaging/templates/Settings.twig
+++ b/plugins/MobileMessaging/templates/index.twig
diff --git a/plugins/MobileMessaging/templates/ReportParameters.twig b/plugins/MobileMessaging/templates/reportParametersPDFReports.twig
index d363c3daaa..d363c3daaa 100644
--- a/plugins/MobileMessaging/templates/ReportParameters.twig
+++ b/plugins/MobileMessaging/templates/reportParametersPDFReports.twig
diff --git a/plugins/MultiSites/Controller.php b/plugins/MultiSites/Controller.php
index 7439edfd3a..7528983551 100644
--- a/plugins/MultiSites/Controller.php
+++ b/plugins/MultiSites/Controller.php
@@ -126,7 +126,7 @@ class Piwik_MultiSites_Controller extends Piwik_Controller
 
         $this->applyPrettyMoney($digestableData);
 
-        $view = new Piwik_View("@MultiSites/index");
+        $view = new Piwik_View("@MultiSites/getSitesInfo");
         $view->isWidgetized = $isWidgetized;
         $view->sitesData = array_values($digestableData);
         $view->evolutionBy = $this->evolutionBy;
diff --git a/plugins/MultiSites/templates/row.twig b/plugins/MultiSites/templates/_siteRow.twig
index 23169836e2..437db12226 100644
--- a/plugins/MultiSites/templates/row.twig
+++ b/plugins/MultiSites/templates/_siteRow.twig
@@ -1,7 +1,7 @@
 <td class="multisites-label label">
     <a title="View reports" href="index.php?module=CoreHome&action=index&date=%date%&period=%period%&idSite=%idsite%">%name%</a>
-    
-    <span style="width: 10px; margin-left:3px"> 
+
+    <span style="width: 10px; margin-left:3px">
 	<a target="_blank" title="{{ 'General_GoTo'|translate("%main_url%") }}" href="%main_url%"><img src="plugins/MultiSites/images/link.gif"/></a>
     </span>
 </td>
@@ -23,8 +23,8 @@
     {% if displayRevenueColumn %}
         <div class="revenue" style="display:none">%revenueSummary%</div>
     {% endif %}
-{% endif %}
-{% if show_sparklines %}
+    {% endif %}
+    {% if show_sparklines %}
     <td style="width:180px">
         <div id="sparkline_%idsite%" style="width: 100px; margin: auto">
             <a target="_blank" href="index.php?module=CoreHome&action=index&date=%date%&period=%period%&idSite=%idsite%"
diff --git a/plugins/MultiSites/templates/index.twig b/plugins/MultiSites/templates/getSitesInfo.twig
index c520c34cff..ebc75894fc 100644
--- a/plugins/MultiSites/templates/index.twig
+++ b/plugins/MultiSites/templates/getSitesInfo.twig
@@ -5,7 +5,7 @@
 {% block content %}
 <div id="multisites">
     <div id="main">
-        {% include "@MultiSites/row.twig" with row %}
+        {% include "@MultiSites/_siteRow.twig" %}
         <script type="text/javascript">
             var allSites = [];
             var params = [];
@@ -36,8 +36,8 @@
 
         {% if not isWidgetized %}
             <div class="top_controls_inner">
-                {% include "@CoreHome/period_select.twig" %}
-                {% include "@CoreHome/header_message.twig" %}
+                {% include "@CoreHome/_periodSelect.twig" %}
+                {% include "@CoreHome/_headerMessage.twig" %}
             </div>
         {% endif %}
 
diff --git a/plugins/Overlay/Controller.php b/plugins/Overlay/Controller.php
index acf6e83411..289e5020af 100644
--- a/plugins/Overlay/Controller.php
+++ b/plugins/Overlay/Controller.php
@@ -17,12 +17,12 @@ class Piwik_Overlay_Controller extends Piwik_Controller
     {
         Piwik::checkUserHasViewAccess($this->idSite);
 
-        $template = 'index';
+        $template = '@Overlay/index';
         if (Piwik_Config::getInstance()->General['overlay_disable_framed_mode']) {
-            $template = 'index_noframe';
+            $template = '@Overlay/index_noframe';
         }
 
-        $view = Piwik_View::factory($template);
+        $view = new Piwik_View($template);
 
         $this->setGeneralVariablesView($view);
         $view->showTopMenu = false;
@@ -100,7 +100,7 @@ class Piwik_Overlay_Controller extends Piwik_Controller
         }
 
         // render template
-        $view = Piwik_View::factory('sidebar');
+        $view = new Piwik_View('@Overlay/renderSidebar');
         $view->data = $data;
         $view->location = $page;
         $view->normalizedUrl = $normalizedCurrentUrl;
@@ -194,7 +194,7 @@ class Piwik_Overlay_Controller extends Piwik_Controller
         $message = Piwik_Translate('Overlay_RedirectUrlError', array($url, "\n"));
         $message = nl2br(htmlentities($message));
 
-        $view = Piwik_View::factory('error_wrong_domain');
+        $view = new Piwik_View('@Overlay/showErrorWrongDomain');
         $view->message = $message;
 
         if (Piwik::isUserHasAdminAccess($idSite)) {
@@ -221,7 +221,7 @@ class Piwik_Overlay_Controller extends Piwik_Controller
      */
     public function notifyParentIframe()
     {
-        $view = Piwik_View::factory('notify_parent_iframe');
+        $view = new Piwik_View('@Overlay/notifyParentIframe');
         echo $view->render();
     }
 
diff --git a/plugins/Overlay/templates/notify_parent_iframe.twig b/plugins/Overlay/templates/notifyParentIframe.twig
index 19327445a1..19327445a1 100644
--- a/plugins/Overlay/templates/notify_parent_iframe.twig
+++ b/plugins/Overlay/templates/notifyParentIframe.twig
diff --git a/plugins/Overlay/templates/sidebar.twig b/plugins/Overlay/templates/renderSidebar.twig
index 3ff6ee50a8..3ff6ee50a8 100644
--- a/plugins/Overlay/templates/sidebar.twig
+++ b/plugins/Overlay/templates/renderSidebar.twig
diff --git a/plugins/Overlay/templates/error_wrong_domain.twig b/plugins/Overlay/templates/showErrorWrongDomain.twig
index 0a39680a12..0a39680a12 100644
--- a/plugins/Overlay/templates/error_wrong_domain.twig
+++ b/plugins/Overlay/templates/showErrorWrongDomain.twig
diff --git a/plugins/PDFReports/PDFReports.php b/plugins/PDFReports/PDFReports.php
index 2380e2ecd2..60f3055ffb 100644
--- a/plugins/PDFReports/PDFReports.php
+++ b/plugins/PDFReports/PDFReports.php
@@ -456,7 +456,7 @@ class Piwik_PDFReports extends Piwik_Plugin
     {
         $out =& $notification->getNotificationObject();
 
-        $view = Piwik_View::factory('@PDFReports/report_parameters');
+        $view = new Piwik_View('@PDFReports/reportParametersPDFReports');
         $view->currentUserEmail = Piwik::getCurrentUserEmail();
         $view->displayFormats = self::getDisplayFormats();
         $view->reportType = self::EMAIL_TYPE;
diff --git a/plugins/PDFReports/templates/add.twig b/plugins/PDFReports/templates/_addReport.twig
index cc76917acb..cc76917acb 100644
--- a/plugins/PDFReports/templates/add.twig
+++ b/plugins/PDFReports/templates/_addReport.twig
diff --git a/plugins/PDFReports/templates/list.twig b/plugins/PDFReports/templates/_listReports.twig
index fd189db862..fd189db862 100644
--- a/plugins/PDFReports/templates/list.twig
+++ b/plugins/PDFReports/templates/_listReports.twig
diff --git a/plugins/PDFReports/templates/index.twig b/plugins/PDFReports/templates/index.twig
index 076936cb40..92f647fb77 100644
--- a/plugins/PDFReports/templates/index.twig
+++ b/plugins/PDFReports/templates/index.twig
@@ -4,7 +4,7 @@
 {% set showSitesSelection=true %}
 
 <div class="top_controls_inner">
-    {% include "@CoreHome/period_select.twig" %}
+    {% include "@CoreHome/_periodSelect.twig" %}
 </div>
 
 <div class="centerLargeDiv">
@@ -14,8 +14,8 @@
         {% import 'ajaxMacros.twig' as ajax %}
         {{ ajax.errorDiv() }}
         {{ ajax.loadingDiv() }}
-        {% include "@PDFReports/list.twig" %}
-        {% include "@PDFReports/add.twig" %}
+        {% include "@PDFReports/_listReports.twig" %}
+        {% include "@PDFReports/_addReport.twig" %}
         <a id='bottom'></a>
     </div>
 </div>
diff --git a/plugins/PDFReports/templates/report_parameters.twig b/plugins/PDFReports/templates/reportParametersPDFReports.twig
index 2a6867b518..2a6867b518 100644
--- a/plugins/PDFReports/templates/report_parameters.twig
+++ b/plugins/PDFReports/templates/reportParametersPDFReports.twig
diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php
index a51addf23d..336587eca0 100644
--- a/plugins/PrivacyManager/Controller.php
+++ b/plugins/PrivacyManager/Controller.php
@@ -86,7 +86,7 @@ class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin
     public function getDatabaseSize()
     {
         Piwik::checkUserIsSuperUser();
-        $view = new Piwik_View('@PrivacyManager/databaseSize');
+        $view = new Piwik_View('@PrivacyManager/getDatabaseSize');
 
         $forceEstimate = Piwik_Common::getRequestVar('forceEstimate', 0);
         $view->dbStats = $this->getDeleteDBSizeEstimate($getSettingsFromQuery = true, $forceEstimate);
diff --git a/plugins/PrivacyManager/templates/databaseSize.twig b/plugins/PrivacyManager/templates/getDatabaseSize.twig
index 2828a245db..2828a245db 100755
--- a/plugins/PrivacyManager/templates/databaseSize.twig
+++ b/plugins/PrivacyManager/templates/getDatabaseSize.twig
diff --git a/plugins/Proxy/Controller.php b/plugins/Proxy/Controller.php
index 12e8435703..1d714e3570 100644
--- a/plugins/Proxy/Controller.php
+++ b/plugins/Proxy/Controller.php
@@ -29,7 +29,7 @@ class Piwik_Proxy_Controller extends Piwik_Controller
     {
         Piwik::checkUserHasSomeViewAccess();
 
-        $view = Piwik_View::factory('exportImage');
+        $view = new Piwik_View('@Proxy/exportImageWindow');
         $view->imageData = 'data:image/png;base64,' . Piwik_Common::getRequestVar('imageData', self::TRANSPARENT_PNG_PIXEL, 'string', $_POST);
         echo $view->render();
     }
diff --git a/plugins/Proxy/templates/exportImage.twig b/plugins/Proxy/templates/exportImageWindow.twig
index 85bc749a0f..85bc749a0f 100644
--- a/plugins/Proxy/templates/exportImage.twig
+++ b/plugins/Proxy/templates/exportImageWindow.twig
diff --git a/plugins/Referers/Controller.php b/plugins/Referers/Controller.php
index 60259d57aa..40d7ab3b6b 100644
--- a/plugins/Referers/Controller.php
+++ b/plugins/Referers/Controller.php
@@ -120,7 +120,7 @@ class Piwik_Referers_Controller extends Piwik_Controller
 
     function getSearchEnginesAndKeywords()
     {
-        $view = new Piwik_View('@Referers/searchEngines_Keywords');
+        $view = new Piwik_View('@Referers/getSearchEnginesAndKeywords');
         $view->searchEngines = $this->getSearchEngines(true);
         $view->keywords = $this->getKeywords(true);
         echo $view->render();
@@ -295,7 +295,7 @@ class Piwik_Referers_Controller extends Piwik_Controller
 
     function indexWebsites($fetch = false)
     {
-        $view = new Piwik_View('@Referers/Websites_SocialNetworks');
+        $view = new Piwik_View('@Referers/indexWebsites');
         $view->websites = $this->getWebsites(true);
         $view->socials = $this->getSocials(true);
         if ($fetch) {
diff --git a/plugins/Referers/templates/searchEngines_Keywords.twig b/plugins/Referers/templates/getSearchEnginesAndKeywords.twig
index d930921631..d930921631 100644
--- a/plugins/Referers/templates/searchEngines_Keywords.twig
+++ b/plugins/Referers/templates/getSearchEnginesAndKeywords.twig
diff --git a/plugins/Referers/templates/index.twig b/plugins/Referers/templates/index.twig
index 23de4ab3ec..d08bb4cbf9 100644
--- a/plugins/Referers/templates/index.twig
+++ b/plugins/Referers/templates/index.twig
@@ -115,5 +115,5 @@
     {{ referrersReportsByDimension|raw }}
 {% endif %}
 
-{% include "@CoreHome/sparkline_footer.twig" %}
+{% include "_sparklineFooter.twig" %}
 
diff --git a/plugins/Referers/templates/Websites_SocialNetworks.twig b/plugins/Referers/templates/indexWebsites.twig
index 44596c307c..44596c307c 100755
--- a/plugins/Referers/templates/Websites_SocialNetworks.twig
+++ b/plugins/Referers/templates/indexWebsites.twig
diff --git a/plugins/SEO/Controller.php b/plugins/SEO/Controller.php
index dad2b1630c..68ae5caa12 100644
--- a/plugins/SEO/Controller.php
+++ b/plugins/SEO/Controller.php
@@ -31,7 +31,7 @@ class Piwik_SEO_Controller extends Piwik_Controller
 
         $dataTable = Piwik_SEO_API::getInstance()->getRank($url);
 
-        $view = new Piwik_View('@SEO/index');
+        $view = new Piwik_View('@SEO/getRank');
         $view->urlToRank = Piwik_SEO_RankChecker::extractDomainFromUrl($url);
 
         $renderer = Piwik_DataTable_Renderer::factory('php');
diff --git a/plugins/SEO/templates/index.twig b/plugins/SEO/templates/getRank.twig
index 0a147b4f62..0a147b4f62 100644
--- a/plugins/SEO/templates/index.twig
+++ b/plugins/SEO/templates/getRank.twig
diff --git a/plugins/SegmentEditor/Controller.php b/plugins/SegmentEditor/Controller.php
index 7c96058ddb..bbb6c6d9ea 100644
--- a/plugins/SegmentEditor/Controller.php
+++ b/plugins/SegmentEditor/Controller.php
@@ -17,7 +17,7 @@ class Piwik_SegmentEditor_Controller extends Piwik_Controller
 
     public function getSelector()
     {
-        $view = Piwik_View::factory('@SegmentEditor/selector');
+        $view = new Piwik_View('@SegmentEditor/getSelector');
         $idSite = Piwik_Common::getRequestVar('idSite');
         $this->setGeneralVariablesView($view);
         $segments = Piwik_API_API::getInstance()->getSegmentsMetadata($idSite);
diff --git a/plugins/SegmentEditor/templates/selector.twig b/plugins/SegmentEditor/templates/getSelector.twig
index 86939a1480..86939a1480 100644
--- a/plugins/SegmentEditor/templates/selector.twig
+++ b/plugins/SegmentEditor/templates/getSelector.twig
diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php
index 2d399f88eb..235037a1b1 100644
--- a/plugins/SitesManager/Controller.php
+++ b/plugins/SitesManager/Controller.php
@@ -119,7 +119,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin
         $idSite = Piwik_Common::getRequestVar('idSite');
         Piwik::checkUserHasViewAccess($idSite);
         $jsTag = Piwik::getJavascriptCode($idSite, Piwik_Url::getCurrentUrlWithoutFileName());
-        $view = new Piwik_View('@SitesManager/Tracking');
+        $view = new Piwik_View('@SitesManager/displayJavascriptCode');
         $this->setBasicVariablesView($view);
         $view->menu = Piwik_GetAdminMenu();
         $view->idSite = $idSite;
@@ -146,7 +146,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin
      */
     function displayAlternativeTagsHelp()
     {
-        $view = new Piwik_View('@SitesManager/DisplayAlternativeTags');
+        $view = new Piwik_View('@SitesManager/displayAlternativeTagsHelp');
         $view->idSite = Piwik_Common::getRequestVar('idSite');
         $url = Piwik_Common::getRequestVar('piwikUrl', '', 'string');
         if (empty($url)
diff --git a/plugins/SitesManager/templates/DisplayJavascriptCode.twig b/plugins/SitesManager/templates/_displayJavascriptCode.twig
index 950ce47705..950ce47705 100644
--- a/plugins/SitesManager/templates/DisplayJavascriptCode.twig
+++ b/plugins/SitesManager/templates/_displayJavascriptCode.twig
diff --git a/plugins/SitesManager/templates/DisplayAlternativeTags.twig b/plugins/SitesManager/templates/displayAlternativeTagsHelp.twig
index 115b9863e2..115b9863e2 100644
--- a/plugins/SitesManager/templates/DisplayAlternativeTags.twig
+++ b/plugins/SitesManager/templates/displayAlternativeTagsHelp.twig
diff --git a/plugins/SitesManager/templates/Tracking.twig b/plugins/SitesManager/templates/displayJavascriptCode.twig
index 6733214fbe..1d19de45f1 100644
--- a/plugins/SitesManager/templates/Tracking.twig
+++ b/plugins/SitesManager/templates/displayJavascriptCode.twig
@@ -3,5 +3,5 @@
 {% block content %}
 {{ loadJavascriptTranslations(['SitesManager']) }}
 
-{% include "@SitesManager/DisplayJavascriptCode.twig" %}
+{% include "@SitesManager/_displayJavascriptCode.twig" %}
 {% endblock %}
\ No newline at end of file
diff --git a/plugins/Transitions/Controller.php b/plugins/Transitions/Controller.php
index e84e4fc9a3..01b72bb7ff 100644
--- a/plugins/Transitions/Controller.php
+++ b/plugins/Transitions/Controller.php
@@ -74,7 +74,7 @@ class Piwik_Transitions_Controller extends Piwik_Controller
      */
     public function renderPopover()
     {
-        $view = new Piwik_View('@Transitions/transitions');
+        $view = new Piwik_View('@Transitions/renderPopover');
         $view->translations = $this->getTranslations();
         echo $view->render();
     }
diff --git a/plugins/Transitions/templates/transitions.twig b/plugins/Transitions/templates/renderPopover.twig
index 0a0163d49a..0a0163d49a 100644
--- a/plugins/Transitions/templates/transitions.twig
+++ b/plugins/Transitions/templates/renderPopover.twig
diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php
index bd4f32075f..404d6fb0be 100644
--- a/plugins/UserCountry/Controller.php
+++ b/plugins/UserCountry/Controller.php
@@ -134,7 +134,7 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin
      */
     private function getGeoIpUpdaterManageScreen()
     {
-        $view = new Piwik_View('@UserCountry/updaterSetup');
+        $view = new Piwik_View('@UserCountry/getGeoIpUpdaterManageScreen');
         $view->geoIPDatabasesInstalled = true;
         $this->setUpdaterManageVars($view);
         return $view->render();
diff --git a/plugins/UserCountry/templates/updaterSetup.twig b/plugins/UserCountry/templates/_updaterManage.twig
index 810fefe146..810fefe146 100755
--- a/plugins/UserCountry/templates/updaterSetup.twig
+++ b/plugins/UserCountry/templates/_updaterManage.twig
diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig
index 2ba90d02e7..1af38efa54 100755
--- a/plugins/UserCountry/templates/adminIndex.twig
+++ b/plugins/UserCountry/templates/adminIndex.twig
@@ -124,7 +124,7 @@
 	        <div id="geoip-download-progress"></div>
         </div>
     {% endif %}
-    {% include "@UserCountry/updaterSetup.twig" %}
+    {% include "@UserCountry/_updaterManage.twig" %}
 {% else %}
 <p style="width:900px" class="form-description">{{ 'UserCountry_CannotSetupGeoIPAutoUpdating'|translate }}</p>
 {% endif %}
diff --git a/plugins/UserCountry/templates/getGeoIpUpdaterManageScreen.twig b/plugins/UserCountry/templates/getGeoIpUpdaterManageScreen.twig
new file mode 100755
index 0000000000..750e395b44
--- /dev/null
+++ b/plugins/UserCountry/templates/getGeoIpUpdaterManageScreen.twig
@@ -0,0 +1 @@
+{% include "@UserCountry/_updaterManage.twig" %}
\ No newline at end of file
diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php
index 078c1745bf..9a02b6ff9f 100644
--- a/plugins/UserCountryMap/Controller.php
+++ b/plugins/UserCountryMap/Controller.php
@@ -30,7 +30,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller
         $date = Piwik_Common::getRequestVar('date');
         $token_auth = Piwik::getCurrentUserTokenAuth();
 
-        $view = new Piwik_View('@UserCountryMap/visitor-map');
+        $view = new Piwik_View('@UserCountryMap/visitorMap');
 
         // request visits summary
         $request = new Piwik_API_Request(
@@ -103,7 +103,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller
         Piwik::checkUserHasViewAccess($idSite);
 
         $token_auth = Piwik::getCurrentUserTokenAuth();
-        $view = new Piwik_View('@UserCountryMap/realtime-map');
+        $view = new Piwik_View('@UserCountryMap/realtimeMap');
 
         $view->mapIsStandaloneNotWidget = $standalone;
 
diff --git a/plugins/UserCountryMap/javascripts/vendor/kartograph.js b/plugins/UserCountryMap/javascripts/vendor/kartograph.js
deleted file mode 100644
index e50442fdc1..0000000000
--- a/plugins/UserCountryMap/javascripts/vendor/kartograph.js
+++ /dev/null
@@ -1,6029 +0,0 @@
-/*
- *  Kartograph - a svg mapping library
- *  Copyright (C) 2011-2013  Gregor Aisch
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-(function () {
-    var $, Aitoff, Azimuthal, BBox, Balthasart, Behrmann, BlurFilter, Bubble, CEA, CantersModifiedSinusoidalI, Circle, CohenSutherland, Conic, Cylindrical, EckertIV, EquidistantAzimuthal, Equirectangular, Filter, GallPeters, GlowFilter, GoodeHomolosine, Hatano, HoboDyer, HtmlLabel, Icon, Kartograph, LAEA, LCC, LabeledBubble, LatLon, Line, LinearScale, LogScale, LonLat, Loximuthal, MapLayer, MapLayerPath, Mercator, Mollweide, NaturalEarth, Nicolosi, Orthographic, PanAndZoomControl, Path, PieChart, Proj, PseudoConic, PseudoCylindrical, QuantileScale, REbraces, REcomment_string, REfull, REmunged, Robinson, Satellite, Scale, Sinusoidal, SqrtScale, StackedBarChart, Stereographic, SvgLabel, Symbol, SymbolGroup, View, WagnerIV, WagnerV, Winkel3, drawPieChart, filter, kartograph, log, map_layer_path_uid, munge, munged, parsedeclarations, resolve, restore, root, uid, warn, __point_in_polygon, __proj, __type, _base, _base1, _ref, _ref1, _ref2, _ref3, _ref4, _ref5,
-        __hasProp = {}.hasOwnProperty,
-        __extends = function (child, parent) {
-            for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; }
-            function ctor() { this.constructor = child; }
-
-            ctor.prototype = parent.prototype;
-            child.prototype = new ctor();
-            child.__super__ = parent.prototype;
-            return child;
-        },
-        __bind = function (fn, me) { return function () { return fn.apply(me, arguments); }; },
-        __indexOf = [].indexOf || function (item) {
-            for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; }
-            return -1;
-        };
-
-    root = typeof exports !== "undefined" && exports !== null ? exports : this;
-
-    kartograph = root.$K = window.Kartograph = (_ref = root.Kartograph) != null ? _ref : root.Kartograph = {};
-
-    kartograph.version = "0.5.2";
-
-    $ = root.jQuery;
-
-    kartograph.__verbose = false;
-
-    warn = function (s) {
-        try {
-            return console.warn.apply(console, arguments);
-        } catch (e) {
-            try {
-                return opera.postError.apply(opera, arguments);
-            } catch (e) {
-                return alert(Array.prototype.join.call(arguments, ' '));
-            }
-        }
-    };
-
-    log = function (s) {
-        if (kartograph.__verbose) {
-            try {
-                return console.debug.apply(console, arguments);
-            } catch (e) {
-                try {
-                    return opera.postError.apply(opera, arguments);
-                } catch (e) {
-                    return alert(Array.prototype.join.call(arguments, ' '));
-                }
-            }
-        }
-    };
-
-    if ((_ref1 = (_base = String.prototype).trim) == null) {
-        _base.trim = function () {
-            return this.replace(/^\s+|\s+$/g, "");
-        };
-    }
-
-    if (!Array.prototype.indexOf) {
-        Array.prototype.indexOf = function (searchElement /*, fromIndex */) {
-            "use strict";
-            if (this == null) {
-                throw new TypeError();
-            }
-            var t = Object(this);
-            var len = t.length >>> 0;
-            if (len === 0) {
-                return -1;
-            }
-            var n = 0;
-            if (arguments.length > 0) {
-                n = Number(arguments[1]);
-                if (n != n) { // shortcut for verifying if it's NaN
-                    n = 0;
-                } else if (n != 0 && n != Infinity && n != -Infinity) {
-                    n = (n > 0 || -1) * Math.floor(Math.abs(n));
-                }
-            }
-            if (n >= len) {
-                return -1;
-            }
-            var k = n >= 0 ? n : Math.max(len - Math.abs(n), 0);
-            for (; k < len; k++) {
-                if (k in t && t[k] === searchElement) {
-                    return k;
-                }
-            }
-            return -1;
-        }
-    }
-    ;
-
-
-    __type = (function () {
-        /*
-         for browser-safe type checking+
-         ported from jQuery's $.type
-         */
-
-        var classToType, name, _i, _len, _ref2;
-        classToType = {};
-        _ref2 = "Boolean Number String Function Array Date RegExp Undefined Null".split(" ");
-        for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-            name = _ref2[_i];
-            classToType["[object " + name + "]"] = name.toLowerCase();
-        }
-        return function (obj) {
-            var strType;
-            strType = Object.prototype.toString.call(obj);
-            return classToType[strType] || "object";
-        };
-    })();
-
-    /*
-     kartograph - a svg mapping library
-     Copyright (C) 2011  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    BBox = (function () {
-        /*
-         2D bounding box
-         */
-
-        function BBox(left, top, width, height) {
-            var s;
-            if (left == null) {
-                left = 0;
-            }
-            if (top == null) {
-                top = 0;
-            }
-            if (width == null) {
-                width = null;
-            }
-            if (height == null) {
-                height = null;
-            }
-            s = this;
-            if (width === null) {
-                s.xmin = Number.MAX_VALUE;
-                s.xmax = Number.MAX_VALUE * -1;
-            } else {
-                s.xmin = s.left = left;
-                s.xmax = s.right = left + width;
-                s.width = width;
-            }
-            if (height === null) {
-                s.ymin = Number.MAX_VALUE;
-                s.ymax = Number.MAX_VALUE * -1;
-            } else {
-                s.ymin = s.top = top;
-                s.ymax = s.bottom = height + top;
-                s.height = height;
-            }
-            return;
-        }
-
-        BBox.prototype.update = function (x, y) {
-            var s;
-            if (!(y != null)) {
-                y = x[1];
-                x = x[0];
-            }
-            s = this;
-            s.xmin = Math.min(s.xmin, x);
-            s.ymin = Math.min(s.ymin, y);
-            s.xmax = Math.max(s.xmax, x);
-            s.ymax = Math.max(s.ymax, y);
-            s.left = s.xmin;
-            s.top = s.ymin;
-            s.right = s.xmax;
-            s.bottom = s.ymax;
-            s.width = s.xmax - s.xmin;
-            s.height = s.ymax - s.ymin;
-            return this;
-        };
-
-        BBox.prototype.intersects = function (bbox) {
-            return bbox.left < s.right && bbox.right > s.left && bbox.top < s.bottom && bbox.bottom > s.top;
-        };
-
-        BBox.prototype.inside = function (x, y) {
-            var s;
-            s = this;
-            return x >= s.left && x <= s.right && y >= s.top && y <= s.bottom;
-        };
-
-        BBox.prototype.join = function (bbox) {
-            var s;
-            s = this;
-            s.update(bbox.left, bbox.top);
-            s.update(bbox.right, bbox.bottom);
-            return this;
-        };
-
-        return BBox;
-
-    })();
-
-    BBox.fromXML = function (xml) {
-        var h, w, x, y;
-        x = Number(xml.getAttribute('x'));
-        y = Number(xml.getAttribute('y'));
-        w = Number(xml.getAttribute('w'));
-        h = Number(xml.getAttribute('h'));
-        return new kartograph.BBox(x, y, w, h);
-    };
-
-    kartograph.BBox = BBox;
-
-    /*
-     kartograph - a svg mapping library
-     Copyright (C) 2011  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    if ((_ref2 = kartograph.geom) == null) {
-        kartograph.geom = {};
-    }
-
-    if ((_ref3 = (_base1 = kartograph.geom).clipping) == null) {
-        _base1.clipping = {};
-    }
-
-    CohenSutherland = (function () {
-        var BOTTOM, INSIDE, LEFT, RIGHT, TOP;
-
-        function CohenSutherland() {}
-
-        INSIDE = 0;
-
-        LEFT = 1;
-
-        RIGHT = 2;
-
-        BOTTOM = 4;
-
-        TOP = 8;
-
-        CohenSutherland.prototype.compute_out_code = function (bbox, x, y) {
-            var code, self;
-            self = this;
-            code = self.INSIDE;
-            if (x < bbox.left) {
-                code |= self.LEFT;
-            } else if (x > bbox.right) {
-                code |= self.RIGHT;
-            }
-            if (y < bbox.top) {
-                code |= self.TOP;
-            } else if (y > bbox.bottom) {
-                code |= self.BOTTOM;
-            }
-            return code;
-        };
-
-        CohenSutherland.prototype.clip = function (bbox, x0, y0, x1, y1) {
-            var accept, code0, code1, cout, self, x, y;
-            self = this;
-            code0 = self.compute_out_code(bbox, x0, y0);
-            code1 = self.compute_out_code(bbox, x1, y1);
-            accept = False;
-            while (True) {
-                if (!(code0 | code1)) {
-                    accept = True;
-                    break;
-                } else if (code0 & code1) {
-                    break;
-                } else {
-                    cout = code === 0 ? code1 : code0;
-                    if (cout & self.TOP) {
-                        x = x0 + (x1 - x0) * (bbox.top - y0) / (y1 - y0);
-                        y = bbox.top;
-                    } else if (cout & self.BOTTOM) {
-                        x = x0 + (x1 - x0) * (bbox.bottom - y0) / (y1 - y0);
-                        y = bbox.bottom;
-                    } else if (cout & self.RIGHT) {
-                        y = y0 + (y1 - y0) * (bbox.right - x0) / (x1 - x0);
-                        x = bbox.right;
-                    } else if (cout & self.LEFT) {
-                        y = y0 + (y1 - y0) * (bbox.left - x0) / (x1 - x0);
-                        x = bbox.left;
-                    }
-                    if (cout === code0) {
-                        x0 = x;
-                        y0 = y;
-                        code0 = self.compute_out_code(bbox, x0, y0);
-                    } else {
-                        x1 = x;
-                        y1 = y;
-                        code1 = self.compute_out_code(bbox, x1, y1);
-                    }
-                }
-            }
-            if (accept) {
-                return [x0, y0, x1, y1];
-            } else {
-                return null;
-            }
-        };
-
-        return CohenSutherland;
-
-    })();
-
-    kartograph.geom.clipping.CohenSutherland = CohenSutherland;
-
-    /*
-     kartograph - a svg mapping library
-     Copyright (C) 2011,2012  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    Kartograph = (function () {
-
-        function Kartograph(container, width, height) {
-            var cnt, me;
-            me = this;
-            me.container = cnt = $(container);
-            if (width == null) {
-                width = cnt.width();
-            }
-            if (height == null) {
-                height = cnt.height();
-            }
-            if (height === 0) {
-                height = 'auto';
-            }
-            me.size = {
-                h: height,
-                w: width
-            };
-            me.markers = [];
-            me.pathById = {};
-            me.container.addClass('kartograph');
-        }
-
-        Kartograph.prototype.createSVGLayer = function (id) {
-            var about, cnt, lid, me, paper, svg, vp, _ref4;
-            me = this;
-            if ((_ref4 = me._layerCnt) == null) {
-                me._layerCnt = 0;
-            }
-            lid = me._layerCnt++;
-            vp = me.viewport;
-            cnt = me.container;
-            paper = Raphael(cnt[0], vp.width, vp.height);
-            svg = $(paper.canvas);
-            svg.css({
-                position: 'absolute',
-                top: '0px',
-                left: '0px',
-                'z-index': lid + 5
-            });
-            if (cnt.css('position') === 'static') {
-                cnt.css({
-                    position: 'relative',
-                    height: vp.height + 'px'
-                });
-            }
-            svg.addClass(id);
-            about = $('desc', paper.canvas).text();
-            $('desc', paper.canvas).text(about.replace('with ', 'with kartograph ' + kartograph.version + ' and '));
-            return paper;
-        };
-
-        Kartograph.prototype.createHTMLLayer = function (id) {
-            var cnt, div, lid, me, vp, _ref4;
-            me = this;
-            vp = me.viewport;
-            cnt = me.container;
-            if ((_ref4 = me._layerCnt) == null) {
-                me._layerCnt = 0;
-            }
-            lid = me._layerCnt++;
-            div = $('<div class="layer ' + id + '" />');
-            div.css({
-                position: 'absolute',
-                top: '0px',
-                left: '0px',
-                width: vp.width + 'px',
-                height: vp.height + 'px',
-                'z-index': lid + 5
-            });
-            cnt.append(div);
-            return div;
-        };
-
-        Kartograph.prototype.loadMap = function (mapurl, callback, opts) {
-            var def, me, _base2, _ref4;
-            me = this;
-            def = $.Deferred();
-            me.clear();
-            me.opts = opts != null ? opts : {};
-            if ((_ref4 = (_base2 = me.opts).zoom) == null) {
-                _base2.zoom = 1;
-            }
-            me.mapLoadCallback = callback;
-            me._loadMapDeferred = def;
-            me._lastMapUrl = mapurl;
-            if (me.cacheMaps && (kartograph.__mapCache[mapurl] != null)) {
-                me._mapLoaded(kartograph.__mapCache[mapurl]);
-            } else {
-                $.ajax({
-                    url: mapurl,
-                    dataType: "text",
-                    success: me._mapLoaded,
-                    context: me,
-                    error: function (a, b, c) {
-                        return warn(a, b, c);
-                    }
-                });
-            }
-            return def.promise();
-        };
-
-        Kartograph.prototype.setMap = function (svg, opts) {
-            var me, _base2, _ref4;
-            me = this;
-            me.opts = opts != null ? opts : {};
-            if ((_ref4 = (_base2 = me.opts).zoom) == null) {
-                _base2.zoom = 1;
-            }
-            me._lastMapUrl = 'string';
-            me._mapLoaded(svg);
-        };
-
-        Kartograph.prototype._mapLoaded = function (xml) {
-            var $view, AB, h, halign, me, padding, ratio, valign, vp, w, zoom, _ref4, _ref5, _ref6, _ref7, _ref8;
-            me = this;
-            if (me.cacheMaps) {
-                if ((_ref4 = kartograph.__mapCache) == null) {
-                    kartograph.__mapCache = {};
-                }
-                kartograph.__mapCache[me._lastMapUrl] = xml;
-            }
-            try {
-                xml = $(xml);
-            } catch (err) {
-                warn('something went horribly wrong while parsing svg');
-                me._loadMapDeferred.reject('could not parse svg');
-                return;
-            }
-            me.svgSrc = xml;
-            $view = $('view', xml);
-            log('got svg src', me.svgSrc);
-            if (!(me.paper != null)) {
-                w = me.size.w;
-                h = me.size.h;
-                if (h === 'auto') {
-                    ratio = $view.attr('w') / $view.attr('h');
-                    h = w / ratio;
-                }
-                me.viewport = new BBox(0, 0, w, h);
-            }
-            vp = me.viewport;
-            log('got viewport', me.viewport);
-            me.viewAB = AB = kartograph.View.fromXML($view[0]);
-            log('got first view', me.viewAB);
-            padding = (_ref5 = me.opts.padding) != null ? _ref5 : 0;
-            halign = (_ref6 = me.opts.halign) != null ? _ref6 : 'center';
-            valign = (_ref7 = me.opts.valign) != null ? _ref7 : 'center';
-            log('got alignment', halign, valign);
-            zoom = (_ref8 = me.opts.zoom) != null ? _ref8 : 1;
-            me.viewBC = new kartograph.View(me.viewAB.asBBox(), vp.width * zoom, vp.height * zoom, padding, halign, valign);
-            log('got second view', me.viewBC);
-            me.proj = kartograph.Proj.fromXML($('proj', $view)[0]);
-            log('got projection', me.proj);
-            if (me.mapLoadCallback != null) {
-                me.mapLoadCallback(me);
-            }
-            if (me._loadMapDeferred != null) {
-                me._loadMapDeferred.resolve(me);
-            }
-        };
-
-        Kartograph.prototype.addLayer = function (id, opts) {
-            var $paths, checkEvents, evt, layer, layer_id, me, path_id, prop, src_id, svgLayer, svg_path, titles, val, _i, _j, _len, _len1, _ref4, _ref5, _ref6;
-            if (opts == null) {
-                opts = {};
-            }
-            /*
-             add new layer
-             */
-
-            me = this;
-            if ((_ref4 = me.layerIds) == null) {
-                me.layerIds = [];
-            }
-            if ((_ref5 = me.layers) == null) {
-                me.layers = {};
-            }
-            if (!(me.paper != null)) {
-                me.paper = me.createSVGLayer();
-            }
-            src_id = id;
-            if (__type(opts) === 'object') {
-                layer_id = opts.name;
-                path_id = opts.key;
-                titles = opts.title;
-            } else {
-                opts = {};
-            }
-            if (layer_id == null) {
-                layer_id = src_id;
-            }
-            svgLayer = $('#' + src_id, me.svgSrc);
-            if (svgLayer.length === 0) {
-                return;
-            }
-            layer = new MapLayer(layer_id, path_id, me, opts.filter);
-            $paths = $('*', svgLayer[0]);
-            for (_i = 0, _len = $paths.length; _i < _len; _i++) {
-                svg_path = $paths[_i];
-                layer.addPath(svg_path, titles);
-            }
-            if (layer.paths.length > 0) {
-                me.layers[layer_id] = layer;
-                me.layerIds.push(layer_id);
-            }
-            checkEvents = ['click', 'mouseenter', 'mouseleave', 'dblclick', 'mousedown', 'mouseup', 'mouseover', 'mouseout'];
-            for (_j = 0, _len1 = checkEvents.length; _j < _len1; _j++) {
-                evt = checkEvents[_j];
-                if (__type(opts[evt]) === 'function') {
-                    layer.on(evt, opts[evt]);
-                }
-            }
-            if (opts.styles != null) {
-                _ref6 = opts.styles;
-                for (prop in _ref6) {
-                    val = _ref6[prop];
-                    layer.style(prop, val);
-                }
-            }
-            if (opts.tooltips != null) {
-                layer.tooltips(opts.tooltips);
-            }
-            return me;
-        };
-
-        Kartograph.prototype.getLayer = function (layer_id) {
-            /* returns a map layer
-             */
-
-            var me;
-            me = this;
-            if (!(me.layers[layer_id] != null)) {
-                warn('could not find layer ' + layer_id);
-                return null;
-            }
-            return me.layers[layer_id];
-        };
-
-        Kartograph.prototype.getLayerPath = function (layer_id, path_id) {
-            var layer, me;
-            me = this;
-            layer = me.getLayer(layer_id);
-            if (layer != null) {
-                if (__type(path_id) === 'object') {
-                    return layer.getPaths(path_id)[0];
-                } else {
-                    return layer.getPath(path_id);
-                }
-            }
-            return null;
-        };
-
-        Kartograph.prototype.onLayerEvent = function (event, callback, layerId) {
-            var me;
-            me = this;
-            me.getLayer(layerId).on(event, callback);
-            return me;
-        };
-
-        Kartograph.prototype.addMarker = function (marker) {
-            var me, xy;
-            me = this;
-            me.markers.push(marker);
-            xy = me.viewBC.project(me.viewAB.project(me.proj.project(marker.lonlat.lon, marker.lonlat.lat)));
-            return marker.render(xy[0], xy[1], me.container, me.paper);
-        };
-
-        Kartograph.prototype.clearMarkers = function () {
-            var marker, me, _i, _len, _ref4;
-            me = this;
-            _ref4 = me.markers;
-            for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
-                marker = _ref4[_i];
-                marker.clear();
-            }
-            return me.markers = [];
-        };
-
-        Kartograph.prototype.fadeIn = function (opts) {
-            var dur, duration, id, layer_id, me, path, paths, _ref4, _ref5, _ref6, _results;
-            if (opts == null) {
-                opts = {};
-            }
-            me = this;
-            layer_id = (_ref4 = opts.layer) != null ? _ref4 : me.layerIds[me.layerIds.length - 1];
-            duration = (_ref5 = opts.duration) != null ? _ref5 : 500;
-            _ref6 = me.layers[layer_id].pathsById;
-            _results = [];
-            for (id in _ref6) {
-                paths = _ref6[id];
-                _results.push((function () {
-                    var _i, _len, _results1;
-                    _results1 = [];
-                    for (_i = 0, _len = paths.length; _i < _len; _i++) {
-                        path = paths[_i];
-                        if (__type(duration) === "function") {
-                            dur = duration(path.data);
-                        } else {
-                            dur = duration;
-                        }
-                        path.svgPath.attr('opacity', 0);
-                        _results1.push(path.svgPath.animate({
-                            opacity: 1
-                        }, dur));
-                    }
-                    return _results1;
-                })());
-            }
-            return _results;
-        };
-
-        /*
-         end of public API
-         */
-
-
-        Kartograph.prototype.loadCoastline = function () {
-            var me;
-            me = this;
-            return $.ajax({
-                url: 'coastline.json',
-                success: me.renderCoastline,
-                context: me
-            });
-        };
-
-        Kartograph.prototype.resize = function (w, h) {
-            /*
-             forces redraw of every layer
-             */
-
-            var cnt, halign, id, layer, me, padding, sg, valign, vp, zoom, _i, _len, _ref4, _ref5, _ref6, _ref7, _ref8;
-            me = this;
-            cnt = me.container;
-            if (w == null) {
-                w = cnt.width();
-            }
-            if (h == null) {
-                h = cnt.height();
-            }
-            me.viewport = vp = new kartograph.BBox(0, 0, w, h);
-            if (me.paper != null) {
-                me.paper.setSize(vp.width, vp.height);
-            }
-            vp = me.viewport;
-            padding = (_ref4 = me.opts.padding) != null ? _ref4 : 0;
-            halign = (_ref5 = me.opts.halign) != null ? _ref5 : 'center';
-            valign = (_ref6 = me.opts.valign) != null ? _ref6 : 'center';
-            zoom = me.opts.zoom;
-            me.viewBC = new kartograph.View(me.viewAB.asBBox(), vp.width * zoom, vp.height * zoom, padding, halign, valign);
-            _ref7 = me.layers;
-            for (id in _ref7) {
-                layer = _ref7[id];
-                layer.setView(me.viewBC);
-            }
-            if (me.symbolGroups != null) {
-                _ref8 = me.symbolGroups;
-                for (_i = 0, _len = _ref8.length; _i < _len; _i++) {
-                    sg = _ref8[_i];
-                    sg.onResize();
-                }
-            }
-        };
-
-        Kartograph.prototype.lonlat2xy = function (lonlat) {
-            var a, me;
-            me = this;
-            if (lonlat.length === 2) {
-                lonlat = new kartograph.LonLat(lonlat[0], lonlat[1]);
-            }
-            if (lonlat.length === 3) {
-                lonlat = new kartograph.LonLat(lonlat[0], lonlat[1], lonlat[2]);
-            }
-            a = me.proj.project(lonlat.lon, lonlat.lat, lonlat.alt);
-            return me.viewBC.project(me.viewAB.project(a));
-        };
-
-        Kartograph.prototype.showZoomControls = function () {
-            var me;
-            me = this;
-            me.zc = new PanAndZoomControl(me);
-            return me;
-        };
-
-        Kartograph.prototype.addSymbolGroup = function (symbolgroup) {
-            var me, _ref4;
-            me = this;
-            if ((_ref4 = me.symbolGroups) == null) {
-                me.symbolGroups = [];
-            }
-            return me.symbolGroups.push(symbolgroup);
-        };
-
-        Kartograph.prototype.removeSymbols = function (index) {
-            var me, sg, _i, _len, _ref4, _results;
-            me = this;
-            if (index != null) {
-                return me.symbolGroups[index].remove();
-            } else {
-                _ref4 = me.symbolGroups;
-                _results = [];
-                for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
-                    sg = _ref4[_i];
-                    _results.push(sg.remove());
-                }
-                return _results;
-            }
-        };
-
-        Kartograph.prototype.clear = function () {
-            var id, me, sg, _i, _len, _ref4;
-            me = this;
-            if (me.layers != null) {
-                for (id in me.layers) {
-                    me.layers[id].remove();
-                }
-                me.layers = {};
-                me.layerIds = [];
-            }
-            if (me.symbolGroups != null) {
-                _ref4 = me.symbolGroups;
-                for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
-                    sg = _ref4[_i];
-                    sg.remove();
-                }
-                me.symbolGroups = [];
-            }
-            if (me.paper != null) {
-                $(me.paper.canvas).remove();
-                return me.paper = void 0;
-            }
-        };
-
-        Kartograph.prototype.loadCSS = function (url, callback) {
-            /*
-             loads a stylesheet
-             */
-
-            var me;
-            me = this;
-            if ($.browser.msie) {
-                return $.ajax({
-                    url: url,
-                    dataType: 'text',
-                    success: function (resp) {
-                        me.styles = kartograph.parsecss(resp);
-                        return callback();
-                    },
-                    error: function (a, b, c) {
-                        return warn('error while loading ' + url, a, b, c);
-                    }
-                });
-            } else {
-                $('body').append('<link rel="stylesheet" href="' + url + '" />');
-                return callback();
-            }
-        };
-
-        Kartograph.prototype.applyCSS = function (el, className) {
-            /*
-             applies pre-loaded css styles to
-             raphael elements
-             */
-
-            var classes, k, me, p, props, sel, selectors, _i, _j, _len, _len1, _ref4, _ref5, _ref6, _ref7;
-            me = this;
-            if (!(me.styles != null)) {
-                return el;
-            }
-            if ((_ref4 = me._pathTypes) == null) {
-                me._pathTypes = ["path", "circle", "rectangle", "ellipse"];
-            }
-            if ((_ref5 = me._regardStyles) == null) {
-                me._regardStyles = ["fill", "stroke", "fill-opacity", "stroke-width", "stroke-opacity"];
-            }
-            for (sel in me.styles) {
-                p = sel;
-                _ref6 = p.split(',');
-                for (_i = 0, _len = _ref6.length; _i < _len; _i++) {
-                    selectors = _ref6[_i];
-                    p = selectors.split(' ');
-                    p = p[p.length - 1];
-                    p = p.split(':');
-                    if (p.length > 1) {
-                        continue;
-                    }
-                    p = p[0].split('.');
-                    classes = p.slice(1);
-                    if (classes.length > 0 && classes.indexOf(className) < 0) {
-                        continue;
-                    }
-                    p = p[0];
-                    if (me._pathTypes.indexOf(p) >= 0 && p !== el.type) {
-                        continue;
-                    }
-                    props = me.styles[sel];
-                    _ref7 = me._regardStyles;
-                    for (_j = 0, _len1 = _ref7.length; _j < _len1; _j++) {
-                        k = _ref7[_j];
-                        if (props[k] != null) {
-                            el.attr(k, props[k]);
-                        }
-                    }
-                }
-            }
-            return el;
-        };
-
-        Kartograph.prototype.style = function (layer, prop, value, duration, delay) {
-            var me;
-            me = this;
-            layer = me.getLayer(layer);
-            if (layer != null) {
-                return layer.style(prop, value, duration, delay);
-            }
-        };
-
-        return Kartograph;
-
-    })();
-
-    kartograph.Kartograph = Kartograph;
-
-    kartograph.map = function (container, width, height) {
-        /* short-hand constructor
-         */
-        return new Kartograph(container, width, height);
-    };
-
-    kartograph.__mapCache = {};
-
-    /*
-     kartograph - a svg mapping library 
-     Copyright (C) 2011  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    LonLat = (function () {
-        /*
-         represents a Point
-         */
-
-        function LonLat(lon, lat, alt) {
-            if (alt == null) {
-                alt = 0;
-            }
-            this.lon = Number(lon);
-            this.lat = Number(lat);
-            this.alt = Number(alt);
-        }
-
-        LonLat.prototype.distance = function (ll) {
-            var R, a, c, dLat, dLon, deg2rad, lat1, lat2, me;
-            me = this;
-            R = 6371;
-            deg2rad = Math.PI / 180;
-            dLat = (ll.lat - me.lat) * deg2rad;
-            dLon = (ll.lon - me.lon) * deg2rad;
-            lat1 = me.lat * deg2rad;
-            lat2 = ll.lat * deg2rad;
-            a = Math.sin(dLat / 2) * Math.sin(dLat / 2) + Math.sin(dLon / 2) * Math.sin(dLon / 2) * Math.cos(lat1) * Math.cos(lat2);
-            c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-            return R * c;
-        };
-
-        return LonLat;
-
-    })();
-
-    LatLon = (function (_super) {
-
-        __extends(LatLon, _super);
-
-        function LatLon(lat, lon, alt) {
-            if (alt == null) {
-                alt = 0;
-            }
-            LatLon.__super__.constructor.call(this, lon, lat, alt);
-        }
-
-        return LatLon;
-
-    })(LonLat);
-
-    kartograph.LonLat = LonLat;
-
-    kartograph.LatLon = LatLon;
-
-    /*
-     kartograph - a svg mapping library 
-     Copyright (C) 2011,2012  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    MapLayer = (function () {
-
-        function MapLayer(layer_id, path_id, map, filter) {
-            var me;
-            me = this;
-            me.id = layer_id;
-            me.path_id = path_id;
-            me.paper = map.paper;
-            me.view = map.viewBC;
-            me.map = map;
-            me.filter = filter;
-        }
-
-        MapLayer.prototype.addPath = function (svg_path, titles) {
-            var layerPath, me, _base2, _name, _ref4, _ref5, _ref6;
-            me = this;
-            if ((_ref4 = me.paths) == null) {
-                me.paths = [];
-            }
-            layerPath = new MapLayerPath(svg_path, me.id, me.map, titles);
-            if (__type(me.filter) === 'function') {
-                if (me.filter(layerPath.data) === false) {
-                    layerPath.remove();
-                    return;
-                }
-            }
-            me.paths.push(layerPath);
-            if (me.path_id != null) {
-                if ((_ref5 = me.pathsById) == null) {
-                    me.pathsById = {};
-                }
-                if ((_ref6 = (_base2 = me.pathsById)[_name = layerPath.data[me.path_id]]) == null) {
-                    _base2[_name] = [];
-                }
-                return me.pathsById[layerPath.data[me.path_id]].push(layerPath);
-            }
-        };
-
-        MapLayer.prototype.hasPath = function (id) {
-            var me;
-            me = this;
-            return (me.pathsById != null) && (me.pathsById[id] != null);
-        };
-
-        MapLayer.prototype.getPathsData = function () {
-            /* returns a list of all shape data dictionaries
-             */
-
-            var me, path, pd, _i, _len, _ref4;
-            me = this;
-            pd = [];
-            _ref4 = me.paths;
-            for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
-                path = _ref4[_i];
-                pd.push(path.data);
-            }
-            return pd;
-        };
-
-        MapLayer.prototype.getPath = function (id) {
-            var me;
-            me = this;
-            if (me.hasPath(id)) {
-                return me.pathsById[id][0];
-            }
-            return null;
-        };
-
-        MapLayer.prototype.getPaths = function (query) {
-            var key, match, matches, me, path, _i, _len, _ref4;
-            me = this;
-            matches = [];
-            if (__type(query) === 'object') {
-                _ref4 = me.paths;
-                for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
-                    path = _ref4[_i];
-                    match = true;
-                    for (key in query) {
-                        match = match && path.data[key] === query[key];
-                    }
-                    if (match) {
-                        matches.push(path);
-                    }
-                }
-            }
-            return matches;
-        };
-
-        MapLayer.prototype.setView = function (view) {
-            /*
-             # after resizing of the map, each layer gets a new view
-             */
-
-            var me, path, _i, _len, _ref4;
-            me = this;
-            _ref4 = me.paths;
-            for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
-                path = _ref4[_i];
-                path.setView(view);
-            }
-            return me;
-        };
-
-        MapLayer.prototype.remove = function () {
-            /*
-             removes every path
-             */
-
-            var me, path, _i, _len, _ref4, _results;
-            me = this;
-            _ref4 = me.paths;
-            _results = [];
-            for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
-                path = _ref4[_i];
-                _results.push(path.remove());
-            }
-            return _results;
-        };
-
-        MapLayer.prototype.style = function (prop, value, duration, delay) {
-            var anim, at, dly, dur, key, me, path, val, _i, _len, _ref4;
-            me = this;
-            if (__type(prop) === "object") {
-                for (key in prop) {
-                    val = prop[key];
-                    me.style(key, val);
-                }
-                return me;
-            }
-            if (duration == null) {
-                duration = 0;
-            }
-            if (delay == null) {
-                delay = 0;
-            }
-            _ref4 = me.paths;
-            for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
-                path = _ref4[_i];
-                val = resolve(value, path.data);
-                dur = resolve(duration, path.data);
-                dly = resolve(delay, path.data);
-                if (dur > 0) {
-                    at = {};
-                    at[prop] = val;
-                    anim = Raphael.animation(at, dur * 1000);
-                    path.svgPath.animate(anim.delay(dly * 1000));
-                } else {
-                    path.svgPath.attr(prop, val);
-                }
-            }
-            return me;
-        };
-
-        MapLayer.prototype.on = function (event, callback) {
-            var EventContext, ctx, me, path, _i, _len, _ref4;
-            me = this;
-            EventContext = (function () {
-
-                function EventContext(type, cb, layer) {
-                    this.type = type;
-                    this.cb = cb;
-                    this.layer = layer;
-                    this.handle = __bind(this.handle, this);
-
-                }
-
-                EventContext.prototype.handle = function (e) {
-                    var path;
-                    me = this;
-                    path = me.layer.map.pathById[e.target.getAttribute('id')];
-                    return me.cb(path.data, path.svgPath, e);
-                };
-
-                return EventContext;
-
-            })();
-            ctx = new EventContext(event, callback, me);
-            _ref4 = me.paths;
-            for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
-                path = _ref4[_i];
-                $(path.svgPath.node).bind(event, ctx.handle);
-            }
-            return me;
-        };
-
-        MapLayer.prototype.tooltips = function (content, delay) {
-            var me, path, setTooltip, tt, _i, _len, _ref4;
-            me = this;
-            setTooltip = function (path, tt) {
-                var cfg;
-                cfg = {
-                    position: {
-                        target: 'mouse',
-                        viewport: $(window),
-                        adjust: {
-                            x: 7,
-                            y: 7
-                        }
-                    },
-                    show: {
-                        delay: delay != null ? delay : 20
-                    },
-                    events: {
-                        show: function (evt, api) {
-                            return $('.qtip').filter(function () {
-                                return this !== api.elements.tooltip.get(0);
-                            }).hide();
-                        }
-                    },
-                    content: {}
-                };
-                if (tt != null) {
-                    if (typeof tt === "string") {
-                        cfg.content.text = tt;
-                    } else if ($.isArray(tt)) {
-                        cfg.content.title = tt[0];
-                        cfg.content.text = tt[1];
-                    }
-                } else {
-                    cfg.content.text = 'n/a';
-                }
-                return $(path.svgPath.node).qtip(cfg);
-            };
-            _ref4 = me.paths;
-            for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
-                path = _ref4[_i];
-                tt = resolve(content, path.data);
-                setTooltip(path, tt);
-            }
-            return me;
-        };
-
-        MapLayer.prototype.sort = function (sortBy) {
-            var lp, me, path, _i, _len, _ref4;
-            me = this;
-            me.paths.sort(function (a, b) {
-                var av, bv, _ref4;
-                av = sortBy(a.data);
-                bv = sortBy(b.data);
-                if (av === bv) {
-                    return 0;
-                }
-                return (_ref4 = av > bv) != null ? _ref4 : {
-                    1: -1
-                };
-            });
-            lp = false;
-            _ref4 = me.paths;
-            for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
-                path = _ref4[_i];
-                if (lp) {
-                    path.svgPath.insertAfter(lp.svgPath);
-                }
-                lp = path;
-            }
-            return me;
-        };
-
-        return MapLayer;
-
-    })();
-
-    resolve = function (prop, data) {
-        if (__type(prop) === 'function') {
-            return prop(data);
-        }
-        return prop;
-    };
-
-    map_layer_path_uid = 0;
-
-    /*
-     kartograph - a svg mapping library 
-     Copyright (C) 2011,2012  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    MapLayerPath = (function () {
-
-        function MapLayerPath(svg_path, layer_id, map, titles) {
-            var attr, data, i, me, paper, path, title, uid, v, view, vn, _i, _ref4;
-            me = this;
-            paper = map.paper;
-            view = map.viewBC;
-            me.path = path = kartograph.geom.Path.fromSVG(svg_path);
-            me.vpath = view.projectPath(path);
-            me.svgPath = me.vpath.toSVG(paper);
-            if (!(map.styles != null)) {
-                me.svgPath.node.setAttribute('class', layer_id);
-            } else {
-                map.applyCSS(me.svgPath, layer_id);
-            }
-            uid = 'path_' + map_layer_path_uid++;
-            me.svgPath.node.setAttribute('id', uid);
-            map.pathById[uid] = me;
-            data = {};
-            for (i = _i = 0, _ref4 = svg_path.attributes.length - 1; 0 <= _ref4 ? _i <= _ref4 : _i >= _ref4; i = 0 <= _ref4 ? ++_i : --_i) {
-                attr = svg_path.attributes[i];
-                if (attr.name.substr(0, 5) === "data-") {
-                    v = attr.value;
-                    vn = Number(v);
-                    if (v.trim() !== "" && vn === v && !isNaN(vn)) {
-                        v = vn;
-                    }
-                    data[attr.name.substr(5)] = v;
-                }
-            }
-            me.data = data;
-            if (__type(titles) === 'string') {
-                title = titles;
-            } else if (__type(titles) === 'function') {
-                title = titles(data);
-            }
-            if (title != null) {
-                me.svgPath.attr('title', title);
-            }
-        }
-
-        MapLayerPath.prototype.setView = function (view) {
-            var me, path, path_str;
-            me = this;
-            path = view.projectPath(me.path);
-            me.vpath = path;
-            if (me.path.type === "path") {
-                path_str = path.svgString();
-                return me.svgPath.attr({
-                    path: path_str
-                });
-            } else if (me.path.type === "circle") {
-                return me.svgPath.attr({
-                    cx: path.x,
-                    cy: path.y,
-                    r: path.r
-                });
-            }
-        };
-
-        MapLayerPath.prototype.remove = function () {
-            var me;
-            me = this;
-            return me.svgPath.remove();
-        };
-
-        return MapLayerPath;
-
-    })();
-
-    /*
-     kartograph - a svg mapping library 
-     Copyright (C) 2011  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    /*
-     This is a reduced version of Danial Wachsstocks jQuery based CSS parser
-     Everything is removed but the core css-to-object parsing
-
-     jQuery based CSS parser
-     documentation: http://youngisrael-stl.org/wordpress/2009/01/16/jquery-css-parser/
-     Version: 1.3
-     Copyright (c) 2011 Daniel Wachsstock
-     MIT license:
-     Permission is hereby granted, free of charge, to any person
-     obtaining a copy of this software and associated documentation
-     files (the "Software"), to deal in the Software without
-     restriction, including without limitation the rights to use,
-     copy, modify, merge, publish, distribute, sublicense, and/or sell
-     copies of the Software, and to permit persons to whom the
-     Software is furnished to do so, subject to the following
-     conditions:
-
-     The above copyright notice and this permission notice shall be
-     included in all copies or substantial portions of the Software.
-
-     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-     OTHER DEALINGS IN THE SOFTWARE.
-     */
-
-
-    kartograph.parsecss = function (str, callback) {
-        var css, k, props, ret, v, _i, _len, _ref4;
-        ret = {};
-        str = munge(str);
-        _ref4 = str.split('`b%');
-        for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
-            css = _ref4[_i];
-            css = css.split('%b`');
-            if (css.length < 2) {
-                continue;
-            }
-            css[0] = restore(css[0]);
-            props = parsedeclarations(css[1]);
-            if (ret[css[0]] != null) {
-                for (k in props) {
-                    v = props[k];
-                    ret[css[0]][k] = v;
-                }
-            } else {
-                ret[css[0]] = props;
-            }
-        }
-        if (__type(callback) === 'function') {
-            callback(ret);
-        } else {
-            return ret;
-        }
-    };
-
-    munged = {};
-
-    parsedeclarations = function (index) {
-        var decl, parsed, str, _i, _len, _ref4;
-        str = munged[index].replace(/^{|}$/g, '');
-        str = munge(str);
-        parsed = {};
-        _ref4 = str.split(';');
-        for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
-            decl = _ref4[_i];
-            decl = decl.split(':');
-            if (decl.length < 2) {
-                continue;
-            }
-            parsed[restore(decl[0])] = restore(decl.slice(1).join(':'));
-        }
-        return parsed;
-    };
-
-    REbraces = /{[^{}]*}/;
-
-    REfull = /\[[^\[\]]*\]|{[^{}]*}|\([^()]*\)|function(\s+\w+)?(\s*%b`\d+`b%){2}/;
-
-    REcomment_string = /(?:\/\*(?:[^\*]|\*[^\/])*\*\/)|(\\.|"(?:[^\\\"]|\\.|\\\n)*"|'(?:[^\\\']|\\.|\\\n)*')/g;
-
-    REmunged = /%\w`(\d+)`\w%/;
-
-    uid = 0;
-
-    munge = function (str, full) {
-        var RE, match, replacement;
-        str = str.replace(REcomment_string, function (s, string) {
-            var replacement;
-            if (!string) {
-                return '';
-            }
-            replacement = '%s`' + (++uid) + '`s%';
-            munged[uid] = string.replace(/^\\/, '');
-            return replacement;
-        });
-        RE = full ? REfull : REbraces;
-        while (match = RE.exec(str)) {
-            replacement = '%b`' + (++uid) + '`b%';
-            munged[uid] = match[0];
-            str = str.replace(RE, replacement);
-        }
-        return str;
-    };
-
-    restore = function (str) {
-        var match;
-        if (!(str != null)) {
-            return str;
-        }
-        while (match = REmunged.exec(str)) {
-            str = str.replace(REmunged, munged[match[1]]);
-        }
-        return str.trim();
-    };
-
-    /*
-     kartograph - a svg mapping library
-     Copyright (C) 2011  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    if ((_ref4 = kartograph.geom) == null) {
-        kartograph.geom = {};
-    }
-
-    Path = (function () {
-        /*
-         represents complex polygons (aka multi-polygons)
-         */
-
-        function Path(type, contours, closed) {
-            var self;
-            if (closed == null) {
-                closed = true;
-            }
-            self = this;
-            self.type = type;
-            self.contours = contours;
-            self.closed = closed;
-        }
-
-        Path.prototype.clipToBBox = function (bbox) {
-            throw "path clipping is not implemented yet";
-        };
-
-        Path.prototype.toSVG = function (paper) {
-            /* translates this path to a SVG path string
-             */
-
-            var str;
-            str = this.svgString();
-            return paper.path(str);
-        };
-
-        Path.prototype.svgString = function () {
-            var contour, fst, glue, me, str, x, y, _i, _j, _len, _len1, _ref5, _ref6;
-            me = this;
-            str = "";
-            glue = me.closed ? "Z M" : "M";
-            _ref5 = me.contours;
-            for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
-                contour = _ref5[_i];
-                fst = true;
-                str += str === "" ? "M" : glue;
-                for (_j = 0, _len1 = contour.length; _j < _len1; _j++) {
-                    _ref6 = contour[_j], x = _ref6[0], y = _ref6[1];
-                    if (!fst) {
-                        str += "L";
-                    }
-                    str += x + ',' + y;
-                    fst = false;
-                }
-            }
-            if (me.closed) {
-                str += "Z";
-            }
-            return str;
-        };
-
-        Path.prototype.area = function () {
-            var area, cnt, i, me, _i, _j, _len, _ref5, _ref6;
-            me = this;
-            if (me.areas != null) {
-                return me._area;
-            }
-            me.areas = [];
-            me._area = 0;
-            _ref5 = me.contours;
-            for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
-                cnt = _ref5[_i];
-                area = 0;
-                for (i = _j = 0, _ref6 = cnt.length - 2; 0 <= _ref6 ? _j <= _ref6 : _j >= _ref6; i = 0 <= _ref6 ? ++_j : --_j) {
-                    area += cnt[i][0] * cnt[i + 1][1] - cnt[i + 1][0] * cnt[i][1];
-                }
-                area *= .5;
-                area = area;
-                me.areas.push(area);
-                me._area += area;
-            }
-            return me._area;
-        };
-
-        Path.prototype.centroid = function () {
-            var S, a, area, cnt, cnt_orig, cx, cy, diff, dx, dy, i, j, k, l, len, me, p0, p1, s, sp, total_len, w, x, x_, y, y_, _i, _j, _k, _l, _lengths, _m, _ref5, _ref6, _ref7, _ref8, _ref9;
-            me = this;
-            if (me._centroid != null) {
-                return me._centroid;
-            }
-            area = me.area();
-            cx = cy = 0;
-            for (i = _i = 0, _ref5 = me.contours.length - 1; 0 <= _ref5 ? _i <= _ref5 : _i >= _ref5; i = 0 <= _ref5 ? ++_i : --_i) {
-                cnt_orig = me.contours[i];
-                cnt = [];
-                l = cnt_orig.length;
-                for (j = _j = 0, _ref6 = l - 1; 0 <= _ref6 ? _j <= _ref6 : _j >= _ref6; j = 0 <= _ref6 ? ++_j : --_j) {
-                    p0 = cnt_orig[j];
-                    p1 = cnt_orig[(j + 1) % l];
-                    diff = 0;
-                    cnt.push(p0);
-                    if (p0[0] === p1[0]) {
-                        diff = Math.abs(p0[1] - p1[1]);
-                    }
-                    if (p0[1] === p1[1]) {
-                        diff = Math.abs(p0[0] - p1[0]);
-                    }
-                    if (diff > 10) {
-                        S = Math.floor(diff * 2);
-                        for (s = _k = 1, _ref7 = S - 1; 1 <= _ref7 ? _k <= _ref7 : _k >= _ref7; s = 1 <= _ref7 ? ++_k : --_k) {
-                            sp = [p0[0] + s / S * (p1[0] - p0[0]), p0[1] + s / S * (p1[1] - p0[1])];
-                            cnt.push(sp);
-                        }
-                    }
-                }
-                a = me.areas[i];
-                x = y = x_ = y_ = 0;
-                l = cnt.length;
-                _lengths = [];
-                total_len = 0;
-                for (j = _l = 0, _ref8 = l - 1; 0 <= _ref8 ? _l <= _ref8 : _l >= _ref8; j = 0 <= _ref8 ? ++_l : --_l) {
-                    p0 = cnt[j];
-                    p1 = cnt[(j + 1) % l];
-                    dx = p1[0] - p0[0];
-                    dy = p1[1] - p0[1];
-                    len = Math.sqrt(dx * dx + dy * dy);
-                    _lengths.push(len);
-                    total_len += len;
-                }
-                for (j = _m = 0, _ref9 = l - 1; 0 <= _ref9 ? _m <= _ref9 : _m >= _ref9; j = 0 <= _ref9 ? ++_m : --_m) {
-                    p0 = cnt[j];
-                    w = _lengths[j] / total_len;
-                    x += w * p0[0];
-                    y += w * p0[1];
-                }
-                k = a / area;
-                cx += x * k;
-                cy += y * k;
-            }
-            me._centroid = [cx, cy];
-            return me._centroid;
-        };
-
-        Path.prototype.isInside = function (x, y) {
-            var bbox, cnt, i, me, _i, _ref5;
-            me = this;
-            bbox = me._bbox;
-            if (x < bbox[0] || x > bbox[2] || y < bbox[1] || y > bbox[3]) {
-                return false;
-            }
-            for (i = _i = 0, _ref5 = me.contours.length - 1; 0 <= _ref5 ? _i <= _ref5 : _i >= _ref5; i = 0 <= _ref5 ? ++_i : --_i) {
-                cnt = me.contours[i];
-                if (__point_in_polygon(cnt, [x, y])) {
-                    return true;
-                }
-            }
-            return false;
-        };
-
-        return Path;
-
-    })();
-
-    kartograph.geom.Path = Path;
-
-    Circle = (function (_super) {
-
-        __extends(Circle, _super);
-
-        function Circle(x, y, r) {
-            this.x = x;
-            this.y = y;
-            this.r = r;
-            Circle.__super__.constructor.call(this, 'circle', null, true);
-        }
-
-        Circle.prototype.toSVG = function (paper) {
-            var me;
-            me = this;
-            return paper.circle(me.x, me.y, me.r);
-        };
-
-        Circle.prototype.centroid = function () {
-            var me;
-            me = this;
-            return [me.x, me.y];
-        };
-
-        Circle.prototype.area = function () {
-            var me;
-            me = this;
-            return Math.PI * me.r * m.r;
-        };
-
-        return Circle;
-
-    })(Path);
-
-    kartograph.geom.Circle = Circle;
-
-    Path.fromSVG = function (path) {
-        /*
-         loads a path from a SVG path string
-         */
-
-        var closed, cmd, contour, contours, cx, cy, path_data, path_str, r, res, sep, type, _i, _len;
-        contours = [];
-        type = path.nodeName;
-        res = null;
-        if (type === "path") {
-            path_str = path.getAttribute('d').trim();
-            path_data = Raphael.parsePathString(path_str);
-            closed = path_data[path_data.length - 1] === "Z";
-            sep = closed ? "Z M" : "M";
-            contour = [];
-            for (_i = 0, _len = path_data.length; _i < _len; _i++) {
-                cmd = path_data[_i];
-                if (cmd.length === 0) {
-                    continue;
-                }
-                if (cmd[0] === "M") {
-                    if (contour.length > 2) {
-                        contours.push(contour);
-                        contour = [];
-                    }
-                    contour.push([cmd[1], cmd[2]]);
-                } else if (cmd[0] === "L") {
-                    contour.push([cmd[1], cmd[2]]);
-                } else if (cmd[0] === "Z") {
-                    if (contour.length > 2) {
-                        contours.push(contour);
-                        contour = [];
-                    }
-                }
-            }
-            if (contour.length > 2) {
-                contours.push(contour);
-                contour = [];
-            }
-            res = new kartograph.geom.Path(type, contours, closed);
-        } else if (type === "circle") {
-            cx = path.getAttribute("cx");
-            cy = path.getAttribute("cy");
-            r = path.getAttribute("r");
-            res = new kartograph.geom.Circle(cx, cy, r);
-        }
-        return res;
-    };
-
-    Line = (function () {
-        /*
-         represents simple lines
-         */
-
-        function Line(points) {
-            this.points = points;
-        }
-
-        Line.prototype.clipToBBox = function (bbox) {
-            var clip, i, last_in, lines, p0x, p0y, p1x, p1y, pts, self, x0, x1, y0, y1, _i, _ref5, _ref6, _ref7, _ref8;
-            self = this;
-            clip = new kartograph.geom.clipping.CohenSutherland().clip;
-            pts = [];
-            lines = [];
-            last_in = false;
-            for (i = _i = 0, _ref5 = self.points.length - 2; 0 <= _ref5 ? _i <= _ref5 : _i >= _ref5; i = 0 <= _ref5 ? ++_i : --_i) {
-                _ref6 = self.points[i], p0x = _ref6[0], p0y = _ref6[1];
-                _ref7 = self.points[i + 1], p1x = _ref7[0], p1y = _ref7[1];
-                try {
-                    _ref8 = clip(bbox, p0x, p0y, p1x, p1y), x0 = _ref8[0], y0 = _ref8[1], x1 = _ref8[2], y1 = _ref8[3];
-                    last_in = true;
-                    pts.push([x0, y0]);
-                    if (p1x !== x1 || p1y !== y0 || i === len(self.points) - 2) {
-                        pts.push([x1, y1]);
-                    }
-                } catch (err) {
-                    if (last_in && pts.length > 1) {
-                        lines.push(new Line(pts));
-                        pts = [];
-                    }
-                    last_in = false;
-                }
-            }
-            if (pts.length > 1) {
-                lines.push(new Line(pts));
-            }
-            return lines;
-        };
-
-        Line.prototype.toSVG = function () {
-            var pts, self, x, y, _i, _len, _ref5, _ref6;
-            self = this;
-            pts = [];
-            _ref5 = self.points;
-            for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
-                _ref6 = _ref5[_i], x = _ref6[0], y = _ref6[1];
-                pts.push(x + ',' + y);
-            }
-            return 'M' + pts.join('L');
-        };
-
-        return Line;
-
-    })();
-
-    kartograph.geom.Line = Line;
-
-    __point_in_polygon = function (polygon, p) {
-        var angle, atan2, dtheta, i, n, pi, theta1, theta2, twopi, x1, x2, y1, y2, _i, _ref5;
-        pi = Math.PI;
-        atan2 = Math.atan2;
-        twopi = pi * 2;
-        n = polygon.length;
-        angle = 0;
-        for (i = _i = 0, _ref5 = n - 1; 0 <= _ref5 ? _i <= _ref5 : _i >= _ref5; i = 0 <= _ref5 ? ++_i : --_i) {
-            x1 = polygon[i][0] - p[0];
-            y1 = polygon[i][1] - p[1];
-            x2 = polygon[(i + 1) % n][0] - p[0];
-            y2 = polygon[(i + 1) % n][1] - p[1];
-            theta1 = atan2(y1, x1);
-            theta2 = atan2(y2, x2);
-            dtheta = theta2 - theta1;
-            while (dtheta > pi) {
-                dtheta -= twopi;
-            }
-            while (dtheta < -pi) {
-                dtheta += twopi;
-            }
-            angle += dtheta;
-        }
-        return Math.abs(angle) >= pi;
-    };
-
-    /*
-     kartograph - a svg mapping library
-     Copyright (C) 2011  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    __proj = kartograph.proj = {};
-
-    Function.prototype.bind = function (scope) {
-        var _function;
-        _function = this;
-        return function () {
-            return _function.apply(scope, arguments);
-        };
-    };
-
-    Proj = (function () {
-
-        Proj.parameters = [];
-
-        Proj.title = "Projection";
-
-        function Proj(opts) {
-            var me, _ref5, _ref6;
-            me = this;
-            me.lon0 = (_ref5 = opts.lon0) != null ? _ref5 : 0;
-            me.lat0 = (_ref6 = opts.lat0) != null ? _ref6 : 0;
-            me.PI = Math.PI;
-            me.HALFPI = me.PI * .5;
-            me.QUARTERPI = me.PI * .25;
-            me.RAD = me.PI / 180;
-            me.DEG = 180 / me.PI;
-            me.lam0 = me.rad(this.lon0);
-            me.phi0 = me.rad(this.lat0);
-            me.minLat = -90;
-            me.maxLat = 90;
-        }
-
-        Proj.prototype.rad = function (a) {
-            return a * this.RAD;
-        };
-
-        Proj.prototype.deg = function (a) {
-            return a * this.DEG;
-        };
-
-        Proj.prototype.plot = function (polygon, truncate) {
-            var ignore, lat, lon, points, vis, x, y, _i, _len, _ref5, _ref6;
-            if (truncate == null) {
-                truncate = true;
-            }
-            points = [];
-            ignore = true;
-            for (_i = 0, _len = polygon.length; _i < _len; _i++) {
-                _ref5 = polygon[_i], lon = _ref5[0], lat = _ref5[1];
-                vis = this._visible(lon, lat);
-                if (vis) {
-                    ignore = false;
-                }
-                _ref6 = this.project(lon, lat), x = _ref6[0], y = _ref6[1];
-                if (!vis && truncate) {
-                    points.push(this._truncate(x, y));
-                } else {
-                    points.push([x, y]);
-                }
-            }
-            if (ignore) {
-                return null;
-            } else {
-                return [points];
-            }
-        };
-
-        Proj.prototype.sea = function () {
-            var l0, lat, lon, o, p, s, _i, _j, _k, _l, _ref5, _ref6, _ref7, _ref8;
-            s = this;
-            p = s.project.bind(this);
-            o = [];
-            l0 = s.lon0;
-            s.lon0 = 0;
-            for (lon = _i = -180; _i <= 180; lon = ++_i) {
-                o.push(p(lon, s.maxLat));
-            }
-            for (lat = _j = _ref5 = s.maxLat, _ref6 = s.minLat; _ref5 <= _ref6 ? _j <= _ref6 : _j >= _ref6; lat = _ref5 <= _ref6 ? ++_j : --_j) {
-                o.push(p(180, lat));
-            }
-            for (lon = _k = 180; _k >= -180; lon = --_k) {
-                o.push(p(lon, s.minLat));
-            }
-            for (lat = _l = _ref7 = s.minLat, _ref8 = s.maxLat; _ref7 <= _ref8 ? _l <= _ref8 : _l >= _ref8; lat = _ref7 <= _ref8 ? ++_l : --_l) {
-                o.push(p(-180, lat));
-            }
-            s.lon0 = l0;
-            return o;
-        };
-
-        Proj.prototype.world_bbox = function () {
-            var bbox, p, s, sea, _i, _len;
-            p = this.project.bind(this);
-            sea = this.sea();
-            bbox = new kartograph.BBox();
-            for (_i = 0, _len = sea.length; _i < _len; _i++) {
-                s = sea[_i];
-                bbox.update(s[0], s[1]);
-            }
-            return bbox;
-        };
-
-        Proj.prototype.toString = function () {
-            var me;
-            me = this;
-            return '[Proj: ' + me.name + ']';
-        };
-
-        return Proj;
-
-    })();
-
-    Proj.fromXML = function (xml) {
-        /*
-         reconstructs a projection from xml description
-         */
-
-        var attr, i, id, opts, proj, _i, _ref5;
-        id = xml.getAttribute('id');
-        opts = {};
-        for (i = _i = 0, _ref5 = xml.attributes.length - 1; 0 <= _ref5 ? _i <= _ref5 : _i >= _ref5; i = 0 <= _ref5 ? ++_i : --_i) {
-            attr = xml.attributes[i];
-            if (attr.name !== "id") {
-                opts[attr.name] = attr.value;
-            }
-        }
-        proj = new kartograph.proj[id](opts);
-        proj.name = id;
-        return proj;
-    };
-
-    kartograph.Proj = Proj;
-
-    Cylindrical = (function (_super) {
-
-        __extends(Cylindrical, _super);
-
-        /*
-         Base class for cylindrical projections
-         */
-
-
-        Cylindrical.parameters = ['lon0', 'flip'];
-
-        Cylindrical.title = "Cylindrical Projection";
-
-        function Cylindrical(opts) {
-            var me, _ref5, _ref6;
-            if (opts == null) {
-                opts = {};
-            }
-            me = this;
-            me.flip = Number((_ref5 = opts.flip) != null ? _ref5 : 0);
-            if (me.flip === 1) {
-                opts.lon0 = (_ref6 = -opts.lon0) != null ? _ref6 : 0;
-            }
-            Cylindrical.__super__.constructor.call(this, opts);
-        }
-
-        Cylindrical.prototype._visible = function (lon, lat) {
-            return true;
-        };
-
-        Cylindrical.prototype.clon = function (lon) {
-            lon -= this.lon0;
-            if (lon < -180) {
-                lon += 360;
-            } else if (lon > 180) {
-                lon -= 360;
-            }
-            return lon;
-        };
-
-        Cylindrical.prototype.ll = function (lon, lat) {
-            if (this.flip === 1) {
-                return [-lon, -lat];
-            } else {
-                return [lon, lat];
-            }
-        };
-
-        return Cylindrical;
-
-    })(Proj);
-
-    Equirectangular = (function (_super) {
-
-        __extends(Equirectangular, _super);
-
-        /*
-         Equirectangular Projection aka Lonlat aka Plate Carree
-         */
-
-
-        function Equirectangular() {
-            return Equirectangular.__super__.constructor.apply(this, arguments);
-        }
-
-        Equirectangular.title = "Equirectangular Projection";
-
-        Equirectangular.prototype.project = function (lon, lat) {
-            var _ref5;
-            _ref5 = this.ll(lon, lat), lon = _ref5[0], lat = _ref5[1];
-            lon = this.clon(lon);
-            return [lon * Math.cos(this.phi0) * 1000, lat * -1 * 1000];
-        };
-
-        return Equirectangular;
-
-    })(Cylindrical);
-
-    __proj['lonlat'] = Equirectangular;
-
-    CEA = (function (_super) {
-
-        __extends(CEA, _super);
-
-        CEA.parameters = ['lon0', 'lat1', 'flip'];
-
-        CEA.title = "Cylindrical Equal Area";
-
-        function CEA(opts) {
-            var _ref5;
-            CEA.__super__.constructor.call(this, opts);
-            this.lat1 = (_ref5 = opts.lat1) != null ? _ref5 : 0;
-            this.phi1 = this.rad(this.lat1);
-        }
-
-        /*
-         Cylindrical Equal Area Projection
-         */
-
-
-        CEA.prototype.project = function (lon, lat) {
-            var lam, phi, x, y, _ref5;
-            _ref5 = this.ll(lon, lat), lon = _ref5[0], lat = _ref5[1];
-            lam = this.rad(this.clon(lon));
-            phi = this.rad(lat * -1);
-            x = lam * Math.cos(this.phi1);
-            y = Math.sin(phi) / Math.cos(this.phi1);
-            return [x * 1000, y * 1000];
-        };
-
-        return CEA;
-
-    })(Cylindrical);
-
-    __proj['cea'] = CEA;
-
-    GallPeters = (function (_super) {
-
-        __extends(GallPeters, _super);
-
-        /*
-         Gall-Peters Projection
-         */
-
-
-        GallPeters.title = "Gall-Peters Projection";
-
-        GallPeters.parameters = ['lon0', 'flip'];
-
-        function GallPeters(opts) {
-            opts.lat1 = 45;
-            GallPeters.__super__.constructor.call(this, opts);
-        }
-
-        return GallPeters;
-
-    })(CEA);
-
-    __proj['gallpeters'] = GallPeters;
-
-    HoboDyer = (function (_super) {
-
-        __extends(HoboDyer, _super);
-
-        /*
-         Hobo-Dyer Projection
-         */
-
-
-        HoboDyer.title = "Hobo-Dyer Projection";
-
-        HoboDyer.parameters = ['lon0', 'flip'];
-
-        function HoboDyer(opts) {
-            opts.lat1 = 37.7;
-            HoboDyer.__super__.constructor.call(this, opts);
-        }
-
-        return HoboDyer;
-
-    })(CEA);
-
-    __proj['hobodyer'] = HoboDyer;
-
-    Behrmann = (function (_super) {
-
-        __extends(Behrmann, _super);
-
-        /*
-         Behrmann Projection
-         */
-
-
-        Behrmann.title = "Behrmann Projection";
-
-        Behrmann.parameters = ['lon0', 'flip'];
-
-        function Behrmann(opts) {
-            opts.lat1 = 30;
-            Behrmann.__super__.constructor.call(this, opts);
-        }
-
-        return Behrmann;
-
-    })(CEA);
-
-    __proj['behrmann'] = Behrmann;
-
-    Balthasart = (function (_super) {
-
-        __extends(Balthasart, _super);
-
-        /*
-         Balthasart Projection
-         */
-
-
-        Balthasart.title = "Balthasart Projection";
-
-        Balthasart.parameters = ['lon0', 'flip'];
-
-        function Balthasart(opts) {
-            opts.lat1 = 50;
-            Balthasart.__super__.constructor.call(this, opts);
-        }
-
-        return Balthasart;
-
-    })(CEA);
-
-    __proj['balthasart'] = Balthasart;
-
-    Mercator = (function (_super) {
-
-        __extends(Mercator, _super);
-
-        /*
-         # you're not really into maps..
-         */
-
-
-        Mercator.title = "Mercator Projection";
-
-        function Mercator(opts) {
-            Mercator.__super__.constructor.call(this, opts);
-            this.minLat = -85;
-            this.maxLat = 85;
-        }
-
-        Mercator.prototype.project = function (lon, lat) {
-            var lam, math, phi, s, x, y, _ref5;
-            s = this;
-            _ref5 = s.ll(lon, lat), lon = _ref5[0], lat = _ref5[1];
-            math = Math;
-            lam = s.rad(s.clon(lon));
-            phi = s.rad(lat * -1);
-            x = lam * 1000;
-            y = math.log((1 + math.sin(phi)) / math.cos(phi)) * 1000;
-            return [x, y];
-        };
-
-        return Mercator;
-
-    })(Cylindrical);
-
-    __proj['mercator'] = Mercator;
-
-    PseudoCylindrical = (function (_super) {
-
-        __extends(PseudoCylindrical, _super);
-
-        /*
-         Base class for pseudo cylindrical projections
-         */
-
-
-        function PseudoCylindrical() {
-            return PseudoCylindrical.__super__.constructor.apply(this, arguments);
-        }
-
-        PseudoCylindrical.title = "Pseudo-Cylindrical Projection";
-
-        return PseudoCylindrical;
-
-    })(Cylindrical);
-
-    NaturalEarth = (function (_super) {
-
-        __extends(NaturalEarth, _super);
-
-        /*
-         Natural Earth Projection
-         see here http://www.shadedrelief.com/NE_proj/
-         */
-
-
-        NaturalEarth.title = "Natural Earth Projection";
-
-        function NaturalEarth(opts) {
-            var s;
-            NaturalEarth.__super__.constructor.call(this, opts);
-            s = this;
-            s.A0 = 0.8707;
-            s.A1 = -0.131979;
-            s.A2 = -0.013791;
-            s.A3 = 0.003971;
-            s.A4 = -0.001529;
-            s.B0 = 1.007226;
-            s.B1 = 0.015085;
-            s.B2 = -0.044475;
-            s.B3 = 0.028874;
-            s.B4 = -0.005916;
-            s.C0 = s.B0;
-            s.C1 = 3 * s.B1;
-            s.C2 = 7 * s.B2;
-            s.C3 = 9 * s.B3;
-            s.C4 = 11 * s.B4;
-            s.EPS = 1e-11;
-            s.MAX_Y = 0.8707 * 0.52 * Math.PI;
-            return;
-        }
-
-        NaturalEarth.prototype.project = function (lon, lat) {
-            var lplam, lpphi, phi2, phi4, s, x, y, _ref5;
-            s = this;
-            _ref5 = s.ll(lon, lat), lon = _ref5[0], lat = _ref5[1];
-            lplam = s.rad(s.clon(lon));
-            lpphi = s.rad(lat * -1);
-            phi2 = lpphi * lpphi;
-            phi4 = phi2 * phi2;
-            x = lplam * (s.A0 + phi2 * (s.A1 + phi2 * (s.A2 + phi4 * phi2 * (s.A3 + phi2 * s.A4)))) * 180 + 500;
-            y = lpphi * (s.B0 + phi2 * (s.B1 + phi4 * (s.B2 + s.B3 * phi2 + s.B4 * phi4))) * 180 + 270;
-            return [x, y];
-        };
-
-        return NaturalEarth;
-
-    })(PseudoCylindrical);
-
-    __proj['naturalearth'] = NaturalEarth;
-
-    Robinson = (function (_super) {
-
-        __extends(Robinson, _super);
-
-        /*
-         Robinson Projection
-         */
-
-
-        Robinson.title = "Robinson Projection";
-
-        function Robinson(opts) {
-            var s;
-            Robinson.__super__.constructor.call(this, opts);
-            s = this;
-            s.X = [1, -5.67239e-12, -7.15511e-05, 3.11028e-06, 0.9986, -0.000482241, -2.4897e-05, -1.33094e-06, 0.9954, -0.000831031, -4.4861e-05, -9.86588e-07, 0.99, -0.00135363, -5.96598e-05, 3.67749e-06, 0.9822, -0.00167442, -4.4975e-06, -5.72394e-06, 0.973, -0.00214869, -9.03565e-05, 1.88767e-08, 0.96, -0.00305084, -9.00732e-05, 1.64869e-06, 0.9427, -0.00382792, -6.53428e-05, -2.61493e-06, 0.9216, -0.00467747, -0.000104566, 4.8122e-06, 0.8962, -0.00536222, -3.23834e-05, -5.43445e-06, 0.8679, -0.00609364, -0.0001139, 3.32521e-06, 0.835, -0.00698325, -6.40219e-05, 9.34582e-07, 0.7986, -0.00755337, -5.00038e-05, 9.35532e-07, 0.7597, -0.00798325, -3.59716e-05, -2.27604e-06, 0.7186, -0.00851366, -7.0112e-05, -8.63072e-06, 0.6732, -0.00986209, -0.000199572, 1.91978e-05, 0.6213, -0.010418, 8.83948e-05, 6.24031e-06, 0.5722, -0.00906601, 0.000181999, 6.24033e-06, 0.5322, 0, 0, 0];
-            s.Y = [0, 0.0124, 3.72529e-10, 1.15484e-09, 0.062, 0.0124001, 1.76951e-08, -5.92321e-09, 0.124, 0.0123998, -7.09668e-08, 2.25753e-08, 0.186, 0.0124008, 2.66917e-07, -8.44523e-08, 0.248, 0.0123971, -9.99682e-07, 3.15569e-07, 0.31, 0.0124108, 3.73349e-06, -1.1779e-06, 0.372, 0.0123598, -1.3935e-05, 4.39588e-06, 0.434, 0.0125501, 5.20034e-05, -1.00051e-05, 0.4968, 0.0123198, -9.80735e-05, 9.22397e-06, 0.5571, 0.0120308, 4.02857e-05, -5.2901e-06, 0.6176, 0.0120369, -3.90662e-05, 7.36117e-07, 0.6769, 0.0117015, -2.80246e-05, -8.54283e-07, 0.7346, 0.0113572, -4.08389e-05, -5.18524e-07, 0.7903, 0.0109099, -4.86169e-05, -1.0718e-06, 0.8435, 0.0103433, -6.46934e-05, 5.36384e-09, 0.8936, 0.00969679, -6.46129e-05, -8.54894e-06, 0.9394, 0.00840949, -0.000192847, -4.21023e-06, 0.9761, 0.00616525, -0.000256001, -4.21021e-06, 1, 0, 0, 0];
-            s.NODES = 18;
-            s.FXC = 0.8487;
-            s.FYC = 1.3523;
-            s.C1 = 11.45915590261646417544;
-            s.RC1 = 0.08726646259971647884;
-            s.ONEEPS = 1.000001;
-            s.EPS = 1e-8;
-            return;
-        }
-
-        Robinson.prototype._poly = function (arr, offs, z) {
-            return arr[offs] + z * (arr[offs + 1] + z * (arr[offs + 2] + z * arr[offs + 3]));
-        };
-
-        Robinson.prototype.project = function (lon, lat) {
-            var i, lplam, lpphi, phi, s, x, y, _ref5;
-            s = this;
-            _ref5 = s.ll(lon, lat), lon = _ref5[0], lat = _ref5[1];
-            lon = s.clon(lon);
-            lplam = s.rad(lon);
-            lpphi = s.rad(lat * -1);
-            phi = Math.abs(lpphi);
-            i = Math.floor(phi * s.C1);
-            if (i >= s.NODES) {
-                i = s.NODES - 1;
-            }
-            phi = s.deg(phi - s.RC1 * i);
-            i *= 4;
-            x = 1000 * s._poly(s.X, i, phi) * s.FXC * lplam;
-            y = 1000 * s._poly(s.Y, i, phi) * s.FYC;
-            if (lpphi < 0.0) {
-                y = -y;
-            }
-            return [x, y];
-        };
-
-        return Robinson;
-
-    })(PseudoCylindrical);
-
-    __proj['robinson'] = Robinson;
-
-    EckertIV = (function (_super) {
-
-        __extends(EckertIV, _super);
-
-        /*
-         Eckert IV Projection
-         */
-
-
-        EckertIV.title = "Eckert IV Projection";
-
-        function EckertIV(opts) {
-            var me;
-            EckertIV.__super__.constructor.call(this, opts);
-            me = this;
-            me.C_x = .42223820031577120149;
-            me.C_y = 1.32650042817700232218;
-            me.RC_y = .75386330736002178205;
-            me.C_p = 3.57079632679489661922;
-            me.RC_p = .28004957675577868795;
-            me.EPS = 1e-7;
-            me.NITER = 6;
-        }
-
-        EckertIV.prototype.project = function (lon, lat) {
-            var V, c, i, lplam, lpphi, me, p, s, x, y, _ref5;
-            me = this;
-            _ref5 = me.ll(lon, lat), lon = _ref5[0], lat = _ref5[1];
-            lplam = me.rad(me.clon(lon));
-            lpphi = me.rad(lat * -1);
-            p = me.C_p * Math.sin(lpphi);
-            V = lpphi * lpphi;
-            lpphi *= 0.895168 + V * (0.0218849 + V * 0.00826809);
-            i = me.NITER;
-            while (i > 0) {
-                c = Math.cos(lpphi);
-                s = Math.sin(lpphi);
-                V = (lpphi + s * (c + 2) - p) / (1 + c * (c + 2) - s * s);
-                lpphi -= V;
-                if (Math.abs(V) < me.EPS) {
-                    break;
-                }
-                i -= 1;
-            }
-            if (i === 0) {
-                x = me.C_x * lplam;
-                y = lpphi < 0 ? -me.C_y : me.C_y;
-            } else {
-                x = me.C_x * lplam * (1 + Math.cos(lpphi));
-                y = me.C_y * Math.sin(lpphi);
-            }
-            return [x, y];
-        };
-
-        return EckertIV;
-
-    })(PseudoCylindrical);
-
-    __proj['eckert4'] = EckertIV;
-
-    Sinusoidal = (function (_super) {
-
-        __extends(Sinusoidal, _super);
-
-        /*
-         Sinusoidal Projection
-         */
-
-
-        function Sinusoidal() {
-            return Sinusoidal.__super__.constructor.apply(this, arguments);
-        }
-
-        Sinusoidal.title = "Sinusoidal Projection";
-
-        Sinusoidal.prototype.project = function (lon, lat) {
-            var lam, me, phi, x, y, _ref5;
-            me = this;
-            _ref5 = me.ll(lon, lat), lon = _ref5[0], lat = _ref5[1];
-            lam = me.rad(me.clon(lon));
-            phi = me.rad(lat * -1);
-            x = 1032 * lam * Math.cos(phi);
-            y = 1032 * phi;
-            return [x, y];
-        };
-
-        return Sinusoidal;
-
-    })(PseudoCylindrical);
-
-    __proj['sinusoidal'] = Sinusoidal;
-
-    Mollweide = (function (_super) {
-
-        __extends(Mollweide, _super);
-
-        /*
-         Mollweide Projection
-         */
-
-
-        Mollweide.title = "Mollweide Projection";
-
-        function Mollweide(opts, p, cx, cy, cp) {
-            var me, p2, r, sp;
-            if (p == null) {
-                p = 1.5707963267948966;
-            }
-            if (cx == null) {
-                cx = null;
-            }
-            if (cy == null) {
-                cy = null;
-            }
-            if (cp == null) {
-                cp = null;
-            }
-            Mollweide.__super__.constructor.call(this, opts);
-            me = this;
-            me.MAX_ITER = 10;
-            me.TOLERANCE = 1e-7;
-            if (p != null) {
-                p2 = p + p;
-                sp = Math.sin(p);
-                r = Math.sqrt(Math.PI * 2.0 * sp / (p2 + Math.sin(p2)));
-                me.cx = 2 * r / Math.PI;
-                me.cy = r / sp;
-                me.cp = p2 + Math.sin(p2);
-            } else if ((cx != null) && (cy != null) && (typeof cz !== "undefined" && cz !== null)) {
-                me.cx = cx;
-                me.cy = cy;
-                me.cp = cp;
-            } else {
-                warn('kartograph.proj.Mollweide: either p or cx,cy,cp must be defined');
-            }
-        }
-
-        Mollweide.prototype.project = function (lon, lat) {
-            var abs, i, k, lam, math, me, phi, v, x, y, _ref5;
-            me = this;
-            _ref5 = me.ll(lon, lat), lon = _ref5[0], lat = _ref5[1];
-            math = Math;
-            abs = math.abs;
-            lam = me.rad(me.clon(lon));
-            phi = me.rad(lat);
-            k = me.cp * math.sin(phi);
-            i = me.MAX_ITER;
-            while (i !== 0) {
-                v = (phi + math.sin(phi) - k) / (1 + math.cos(phi));
-                phi -= v;
-                if (abs(v) < me.TOLERANCE) {
-                    break;
-                }
-                i -= 1;
-            }
-            if (i === 0) {
-                phi = phi >= 0 ? me.HALFPI : -me.HALFPI;
-            } else {
-                phi *= 0.5;
-            }
-            x = 1000 * me.cx * lam * math.cos(phi);
-            y = 1000 * me.cy * math.sin(phi);
-            return [x, y * -1];
-        };
-
-        return Mollweide;
-
-    })(PseudoCylindrical);
-
-    __proj['mollweide'] = Mollweide;
-
-    WagnerIV = (function (_super) {
-
-        __extends(WagnerIV, _super);
-
-        /*
-         Wagner IV Projection
-         */
-
-
-        WagnerIV.title = "Wagner IV Projection";
-
-        function WagnerIV(opts) {
-            WagnerIV.__super__.constructor.call(this, opts, 1.0471975511965976);
-        }
-
-        return WagnerIV;
-
-    })(Mollweide);
-
-    __proj['wagner4'] = WagnerIV;
-
-    WagnerV = (function (_super) {
-
-        __extends(WagnerV, _super);
-
-        /*
-         Wagner V Projection
-         */
-
-
-        WagnerV.title = "Wagner V Projection";
-
-        function WagnerV(opts) {
-            WagnerV.__super__.constructor.call(this, opts, null, 0.90977, 1.65014, 3.00896);
-        }
-
-        return WagnerV;
-
-    })(Mollweide);
-
-    __proj['wagner5'] = WagnerV;
-
-    Loximuthal = (function (_super) {
-        var maxLat, minLat;
-
-        __extends(Loximuthal, _super);
-
-        function Loximuthal() {
-            return Loximuthal.__super__.constructor.apply(this, arguments);
-        }
-
-        minLat = -89;
-
-        maxLat = 89;
-
-        Loximuthal.parameters = ['lon0', 'lat0', 'flip'];
-
-        Loximuthal.title = "Loximuthal Projection (equidistant)";
-
-        Loximuthal.prototype.project = function (lon, lat) {
-            var lam, math, me, phi, x, y, _ref5;
-            me = this;
-            _ref5 = me.ll(lon, lat), lon = _ref5[0], lat = _ref5[1];
-            math = Math;
-            lam = me.rad(me.clon(lon));
-            phi = me.rad(lat);
-            if (phi === me.phi0) {
-                x = lam * math.cos(me.phi0);
-            } else {
-                x = lam * (phi - me.phi0) / (math.log(math.tan(me.QUARTERPI + phi * 0.5)) - math.log(math.tan(me.QUARTERPI + me.phi0 * 0.5)));
-            }
-            x *= 1000;
-            y = 1000 * (phi - me.phi0);
-            return [x, y * -1];
-        };
-
-        return Loximuthal;
-
-    })(PseudoCylindrical);
-
-    __proj['loximuthal'] = Loximuthal;
-
-    CantersModifiedSinusoidalI = (function (_super) {
-        var C1, C3, C3x3, C5, C5x5;
-
-        __extends(CantersModifiedSinusoidalI, _super);
-
-        /*
-         Canters, F. (2002) Small-scale Map projection Design. p. 218-219.
-         Modified Sinusoidal, equal-area.
-
-         implementation borrowed from
-         http://cartography.oregonstate.edu/temp/AdaptiveProjection/src/projections/Canters1.js
-         */
-
-
-        function CantersModifiedSinusoidalI() {
-            return CantersModifiedSinusoidalI.__super__.constructor.apply(this, arguments);
-        }
-
-        CantersModifiedSinusoidalI.title = "Canters Modified Sinusoidal I";
-
-        CantersModifiedSinusoidalI.parameters = ['lon0'];
-
-        C1 = 1.1966;
-
-        C3 = -0.1290;
-
-        C3x3 = 3 * C3;
-
-        C5 = -0.0076;
-
-        C5x5 = 5 * C5;
-
-        CantersModifiedSinusoidalI.prototype.project = function (lon, lat) {
-            var me, x, y, y2, y4, _ref5;
-            me = this;
-            _ref5 = me.ll(lon, lat), lon = _ref5[0], lat = _ref5[1];
-            lon = me.rad(me.clon(lon));
-            lat = me.rad(lat);
-            y2 = lat * lat;
-            y4 = y2 * y2;
-            x = 1000 * lon * Math.cos(lat) / (C1 + C3x3 * y2 + C5x5 * y4);
-            y = 1000 * lat * (C1 + C3 * y2 + C5 * y4);
-            return [x, y * -1];
-        };
-
-        return CantersModifiedSinusoidalI;
-
-    })(PseudoCylindrical);
-
-    __proj['canters1'] = CantersModifiedSinusoidalI;
-
-    Hatano = (function (_super) {
-        var CN, CS, EPS, FXC, FYCN, FYCS, NITER, ONETOL, RCN, RCS, RXC, RYCN, RYCS;
-
-        __extends(Hatano, _super);
-
-        Hatano.title = "Hatano Projection";
-
-        NITER = 20;
-
-        EPS = 1e-7;
-
-        ONETOL = 1.000001;
-
-        CN = 2.67595;
-
-        CS = 2.43763;
-
-        RCN = 0.37369906014686373063;
-
-        RCS = 0.41023453108141924738;
-
-        FYCN = 1.75859;
-
-        FYCS = 1.93052;
-
-        RYCN = 0.56863737426006061674;
-
-        RYCS = 0.51799515156538134803;
-
-        FXC = 0.85;
-
-        RXC = 1.17647058823529411764;
-
-        function Hatano(opts) {
-            Hatano.__super__.constructor.call(this, opts);
-        }
-
-        Hatano.prototype.project = function (lon, lat) {
-            var c, i, lam, me, phi, th1, x, y, _i, _ref5;
-            me = this;
-            _ref5 = me.ll(lon, lat), lon = _ref5[0], lat = _ref5[1];
-            lam = me.rad(me.clon(lon));
-            phi = me.rad(lat);
-            c = Math.sin(phi) * (phi < 0.0 ? CS : CN);
-            for (i = _i = NITER; _i >= 1; i = _i += -1) {
-                th1 = (phi + Math.sin(phi) - c) / (1.0 + Math.cos(phi));
-                phi -= th1;
-                if (Math.abs(th1) < EPS) {
-                    break;
-                }
-            }
-            x = 1000 * FXC * lam * Math.cos(phi *= 0.5);
-            y = 1000 * Math.sin(phi) * (phi < 0.0 ? FYCS : FYCN);
-            return [x, y * -1];
-        };
-
-        return Hatano;
-
-    })(PseudoCylindrical);
-
-    __proj['hatano'] = Hatano;
-
-    GoodeHomolosine = (function (_super) {
-
-        __extends(GoodeHomolosine, _super);
-
-        GoodeHomolosine.title = "Goode Homolosine Projection";
-
-        GoodeHomolosine.parameters = ['lon0'];
-
-        function GoodeHomolosine(opts) {
-            var me;
-            GoodeHomolosine.__super__.constructor.call(this, opts);
-            me = this;
-            me.lat1 = 41.737;
-            me.p1 = new Mollweide();
-            me.p0 = new Sinusoidal();
-        }
-
-        GoodeHomolosine.prototype.project = function (lon, lat) {
-            var me, _ref5;
-            me = this;
-            _ref5 = me.ll(lon, lat), lon = _ref5[0], lat = _ref5[1];
-            lon = me.clon(lon);
-            if (Math.abs(lat) > me.lat1) {
-                return me.p1.project(lon, lat);
-            } else {
-                return me.p0.project(lon, lat);
-            }
-        };
-
-        return GoodeHomolosine;
-
-    })(PseudoCylindrical);
-
-    __proj['goodehomolosine'] = GoodeHomolosine;
-
-    Nicolosi = (function (_super) {
-        var EPS;
-
-        __extends(Nicolosi, _super);
-
-        Nicolosi.title = "Nicolosi Globular Projection";
-
-        Nicolosi.parameters = ['lon0'];
-
-        EPS = 1e-10;
-
-        function Nicolosi(opts) {
-            Nicolosi.__super__.constructor.call(this, opts);
-            this.r = this.HALFPI * 100;
-        }
-
-        Nicolosi.prototype._visible = function (lon, lat) {
-            var me;
-            me = this;
-            lon = me.clon(lon);
-            return lon > -90 && lon < 90;
-        };
-
-        Nicolosi.prototype.project = function (lon, lat) {
-            var c, d, lam, m, me, n, phi, r2, sp, tb, x, y, _ref5;
-            me = this;
-            _ref5 = me.ll(lon, lat), lon = _ref5[0], lat = _ref5[1];
-            lam = me.rad(me.clon(lon));
-            phi = me.rad(lat);
-            if (Math.abs(lam) < EPS) {
-                x = 0;
-                y = phi;
-            } else if (Math.abs(phi) < EPS) {
-                x = lam;
-                y = 0;
-            } else if (Math.abs(Math.abs(lam) - me.HALFPI) < EPS) {
-                x = lam * Math.cos(phi);
-                y = me.HALFPI * Math.sin(phi);
-            } else if (Math.abs(Math.abs(phi) - me.HALFPI) < EPS) {
-                x = 0;
-                y = phi;
-            } else {
-                tb = me.HALFPI / lam - lam / me.HALFPI;
-                c = phi / me.HALFPI;
-                sp = Math.sin(phi);
-                d = (1 - c * c) / (sp - c);
-                r2 = tb / d;
-                r2 *= r2;
-                m = (tb * sp / d - 0.5 * tb) / (1.0 + r2);
-                n = (sp / r2 + 0.5 * d) / (1.0 + 1.0 / r2);
-                x = Math.cos(phi);
-                x = Math.sqrt(m * m + x * x / (1.0 + r2));
-                x = me.HALFPI * (m + (lam < 0 ? -x : x));
-                y = Math.sqrt(n * n - (sp * sp / r2 + d * sp - 1.0) / (1.0 + 1.0 / r2));
-                y = me.HALFPI * (n + (phi < 0 ? y : -y));
-            }
-            return [x * 100, y * -100];
-        };
-
-        Nicolosi.prototype.sea = function () {
-            var math, out, phi, r, _i;
-            out = [];
-            r = this.r;
-            math = Math;
-            for (phi = _i = 0; _i <= 360; phi = ++_i) {
-                out.push([math.cos(this.rad(phi)) * r, math.sin(this.rad(phi)) * r]);
-            }
-            return out;
-        };
-
-        Nicolosi.prototype.world_bbox = function () {
-            var r;
-            r = this.r;
-            return new kartograph.BBox(-r, -r, r * 2, r * 2);
-        };
-
-        return Nicolosi;
-
-    })(PseudoCylindrical);
-
-    __proj['nicolosi'] = Nicolosi;
-
-    Azimuthal = (function (_super) {
-
-        __extends(Azimuthal, _super);
-
-        /*
-         Base class for azimuthal projections
-         */
-
-
-        Azimuthal.parameters = ['lon0', 'lat0'];
-
-        Azimuthal.title = "Azimuthal Projection";
-
-        function Azimuthal(opts, rad) {
-            var me;
-            if (rad == null) {
-                rad = 1000;
-            }
-            Azimuthal.__super__.constructor.call(this, opts);
-            me = this;
-            me.r = rad;
-            me.elevation0 = me.to_elevation(me.lat0);
-            me.azimuth0 = me.to_azimuth(me.lon0);
-        }
-
-        Azimuthal.prototype.to_elevation = function (lat) {
-            var me;
-            me = this;
-            return ((lat + 90) / 180) * me.PI - me.HALFPI;
-        };
-
-        Azimuthal.prototype.to_azimuth = function (lon) {
-            var me;
-            me = this;
-            return ((lon + 180) / 360) * me.PI * 2 - me.PI;
-        };
-
-        Azimuthal.prototype._visible = function (lon, lat) {
-            var azimuth, cosc, elevation, math, me;
-            me = this;
-            math = Math;
-            elevation = me.to_elevation(lat);
-            azimuth = me.to_azimuth(lon);
-            cosc = math.sin(elevation) * math.sin(me.elevation0) + math.cos(me.elevation0) * math.cos(elevation) * math.cos(azimuth - me.azimuth0);
-            return cosc >= 0.0;
-        };
-
-        Azimuthal.prototype._truncate = function (x, y) {
-            var math, r, theta, x1, y1;
-            math = Math;
-            r = this.r;
-            theta = math.atan2(y - r, x - r);
-            x1 = r + r * math.cos(theta);
-            y1 = r + r * math.sin(theta);
-            return [x1, y1];
-        };
-
-        Azimuthal.prototype.sea = function () {
-            var math, out, phi, r, _i;
-            out = [];
-            r = this.r;
-            math = Math;
-            for (phi = _i = 0; _i <= 360; phi = ++_i) {
-                out.push([r + math.cos(this.rad(phi)) * r, r + math.sin(this.rad(phi)) * r]);
-            }
-            return out;
-        };
-
-        Azimuthal.prototype.world_bbox = function () {
-            var r;
-            r = this.r;
-            return new kartograph.BBox(0, 0, r * 2, r * 2);
-        };
-
-        return Azimuthal;
-
-    })(Proj);
-
-    Orthographic = (function (_super) {
-
-        __extends(Orthographic, _super);
-
-        /*
-         Orthographic Azimuthal Projection
-
-         implementation taken from http://www.mccarroll.net/snippets/svgworld/
-         */
-
-
-        function Orthographic() {
-            return Orthographic.__super__.constructor.apply(this, arguments);
-        }
-
-        Orthographic.title = "Orthographic Projection";
-
-        Orthographic.prototype.project = function (lon, lat) {
-            var azimuth, elevation, math, me, x, xo, y, yo;
-            me = this;
-            math = Math;
-            elevation = me.to_elevation(lat);
-            azimuth = me.to_azimuth(lon);
-            xo = me.r * math.cos(elevation) * math.sin(azimuth - me.azimuth0);
-            yo = -me.r * (math.cos(me.elevation0) * math.sin(elevation) - math.sin(me.elevation0) * math.cos(elevation) * math.cos(azimuth - me.azimuth0));
-            x = me.r + xo;
-            y = me.r + yo;
-            return [x, y];
-        };
-
-        return Orthographic;
-
-    })(Azimuthal);
-
-    __proj['ortho'] = Orthographic;
-
-    LAEA = (function (_super) {
-
-        __extends(LAEA, _super);
-
-        /*
-         Lambert Azimuthal Equal-Area Projection
-
-         implementation taken from
-         Snyder, Map projections - A working manual
-         */
-
-
-        LAEA.title = "Lambert Azimuthal Equal-Area Projection";
-
-        function LAEA(opts) {
-            LAEA.__super__.constructor.call(this, opts);
-            this.scale = Math.sqrt(2) * 0.5;
-        }
-
-        LAEA.prototype.project = function (lon, lat) {
-            var cos, k, lam, math, phi, sin, x, xo, y, yo;
-            phi = this.rad(lat);
-            lam = this.rad(lon);
-            math = Math;
-            sin = math.sin;
-            cos = math.cos;
-            if (false && math.abs(lon - this.lon0) === 180) {
-                xo = this.r * 2;
-                yo = 0;
-            } else {
-                k = math.pow(2 / (1 + sin(this.phi0) * sin(phi) + cos(this.phi0) * cos(phi) * cos(lam - this.lam0)), .5);
-                k *= this.scale;
-                xo = this.r * k * cos(phi) * sin(lam - this.lam0);
-                yo = -this.r * k * (cos(this.phi0) * sin(phi) - sin(this.phi0) * cos(phi) * cos(lam - this.lam0));
-            }
-            x = this.r + xo;
-            y = this.r + yo;
-            return [x, y];
-        };
-
-        return LAEA;
-
-    })(Azimuthal);
-
-    __proj['laea'] = LAEA;
-
-    Stereographic = (function (_super) {
-
-        __extends(Stereographic, _super);
-
-        /*
-         Stereographic projection
-
-         implementation taken from
-         Snyder, Map projections - A working manual
-         */
-
-
-        function Stereographic() {
-            return Stereographic.__super__.constructor.apply(this, arguments);
-        }
-
-        Stereographic.title = "Stereographic Projection";
-
-        Stereographic.prototype.project = function (lon, lat) {
-            var cos, k, k0, lam, math, phi, sin, x, xo, y, yo;
-            phi = this.rad(lat);
-            lam = this.rad(lon);
-            math = Math;
-            sin = math.sin;
-            cos = math.cos;
-            k0 = 0.5;
-            k = 2 * k0 / (1 + sin(this.phi0) * sin(phi) + cos(this.phi0) * cos(phi) * cos(lam - this.lam0));
-            xo = this.r * k * cos(phi) * sin(lam - this.lam0);
-            yo = -this.r * k * (cos(this.phi0) * sin(phi) - sin(this.phi0) * cos(phi) * cos(lam - this.lam0));
-            x = this.r + xo;
-            y = this.r + yo;
-            return [x, y];
-        };
-
-        return Stereographic;
-
-    })(Azimuthal);
-
-    __proj['stereo'] = Stereographic;
-
-    Satellite = (function (_super) {
-
-        __extends(Satellite, _super);
-
-        /*
-         General perspective projection, aka Satellite projection
-
-         implementation taken from
-         Snyder, Map projections - A working manual
-
-         up .. angle the camera is turned away from north (clockwise)
-         tilt .. angle the camera is tilted
-         */
-
-
-        Satellite.parameters = ['lon0', 'lat0', 'tilt', 'dist', 'up'];
-
-        Satellite.title = "Satellite Projection";
-
-        function Satellite(opts) {
-            var lat, lon, xmax, xmin, xy, _i, _j, _ref5, _ref6, _ref7;
-            Satellite.__super__.constructor.call(this, {
-                lon0: 0,
-                lat0: 0
-            });
-            this.dist = (_ref5 = opts.dist) != null ? _ref5 : 3;
-            this.up = this.rad((_ref6 = opts.up) != null ? _ref6 : 0);
-            this.tilt = this.rad((_ref7 = opts.tilt) != null ? _ref7 : 0);
-            this.scale = 1;
-            xmin = Number.MAX_VALUE;
-            xmax = Number.MAX_VALUE * -1;
-            for (lat = _i = 0; _i <= 179; lat = ++_i) {
-                for (lon = _j = 0; _j <= 360; lon = ++_j) {
-                    xy = this.project(lon - 180, lat - 90);
-                    xmin = Math.min(xy[0], xmin);
-                    xmax = Math.max(xy[0], xmax);
-                }
-            }
-            this.scale = (this.r * 2) / (xmax - xmin);
-            Satellite.__super__.constructor.call(this, opts);
-            return;
-        }
-
-        Satellite.prototype.project = function (lon, lat, alt) {
-            var A, H, cos, cos_c, cos_tilt, cos_up, k, lam, math, phi, r, ra, sin, sin_tilt, sin_up, x, xo, xt, y, yo, yt;
-            if (alt == null) {
-                alt = 0;
-            }
-            phi = this.rad(lat);
-            lam = this.rad(lon);
-            math = Math;
-            sin = math.sin;
-            cos = math.cos;
-            r = this.r;
-            ra = r * (alt + 6371) / 3671;
-            cos_c = sin(this.phi0) * sin(phi) + cos(this.phi0) * cos(phi) * cos(lam - this.lam0);
-            k = (this.dist - 1) / (this.dist - cos_c);
-            k = (this.dist - 1) / (this.dist - cos_c);
-            k *= this.scale;
-            xo = ra * k * cos(phi) * sin(lam - this.lam0);
-            yo = -ra * k * (cos(this.phi0) * sin(phi) - sin(this.phi0) * cos(phi) * cos(lam - this.lam0));
-            cos_up = cos(this.up);
-            sin_up = sin(this.up);
-            cos_tilt = cos(this.tilt);
-            sin_tilt = sin(this.tilt);
-            H = ra * (this.dist - 1);
-            A = ((yo * cos_up + xo * sin_up) * sin(this.tilt / H)) + cos_tilt;
-            xt = (xo * cos_up - yo * sin_up) * cos(this.tilt / A);
-            yt = (yo * cos_up + xo * sin_up) / A;
-            x = r + xt;
-            y = r + yt;
-            return [x, y];
-        };
-
-        Satellite.prototype._visible = function (lon, lat) {
-            var azimuth, cosc, elevation, math;
-            elevation = this.to_elevation(lat);
-            azimuth = this.to_azimuth(lon);
-            math = Math;
-            cosc = math.sin(elevation) * math.sin(this.elevation0) + math.cos(this.elevation0) * math.cos(elevation) * math.cos(azimuth - this.azimuth0);
-            return cosc >= (1.0 / this.dist);
-        };
-
-        Satellite.prototype.sea = function () {
-            var math, out, phi, r, _i;
-            out = [];
-            r = this.r;
-            math = Math;
-            for (phi = _i = 0; _i <= 360; phi = ++_i) {
-                out.push([r + math.cos(this.rad(phi)) * r, r + math.sin(this.rad(phi)) * r]);
-            }
-            return out;
-        };
-
-        return Satellite;
-
-    })(Azimuthal);
-
-    __proj['satellite'] = Satellite;
-
-    EquidistantAzimuthal = (function (_super) {
-
-        __extends(EquidistantAzimuthal, _super);
-
-        /*
-         Equidistant projection
-
-         implementation taken from
-         Snyder, Map projections - A working manual
-         */
-
-
-        function EquidistantAzimuthal() {
-            return EquidistantAzimuthal.__super__.constructor.apply(this, arguments);
-        }
-
-        EquidistantAzimuthal.title = "Equidistant Azimuthal Projection";
-
-        EquidistantAzimuthal.prototype.project = function (lon, lat) {
-            var c, cos, cos_c, k, lam, math, me, phi, sin, x, xo, y, yo;
-            me = this;
-            phi = me.rad(lat);
-            lam = me.rad(lon);
-            math = Math;
-            sin = math.sin;
-            cos = math.cos;
-            cos_c = sin(this.phi0) * sin(phi) + cos(this.phi0) * cos(phi) * cos(lam - this.lam0);
-            c = math.acos(cos_c);
-            k = 0.325 * c / sin(c);
-            xo = this.r * k * cos(phi) * sin(lam - this.lam0);
-            yo = -this.r * k * (cos(this.phi0) * sin(phi) - sin(this.phi0) * cos(phi) * cos(lam - this.lam0));
-            x = this.r + xo;
-            y = this.r + yo;
-            return [x, y];
-        };
-
-        EquidistantAzimuthal.prototype._visible = function (lon, lat) {
-            return true;
-        };
-
-        return EquidistantAzimuthal;
-
-    })(Azimuthal);
-
-    __proj['equi'] = EquidistantAzimuthal;
-
-    Aitoff = (function (_super) {
-        var COSPHI1;
-
-        __extends(Aitoff, _super);
-
-        /*
-         Aitoff projection
-
-         implementation taken from
-         Snyder, Map projections - A working manual
-         */
-
-
-        Aitoff.title = "Aitoff Projection";
-
-        Aitoff.parameters = ['lon0'];
-
-        COSPHI1 = 0.636619772367581343;
-
-        function Aitoff(opts) {
-            var me;
-            me = this;
-            opts.lat0 = 0;
-            Aitoff.__super__.constructor.call(this, opts);
-            me.lam0 = 0;
-        }
-
-        Aitoff.prototype.project = function (lon, lat) {
-            var c, d, lam, me, phi, x, y, _ref5;
-            me = this;
-            _ref5 = me.ll(lon, lat), lon = _ref5[0], lat = _ref5[1];
-            lon = me.clon(lon);
-            lam = me.rad(lon);
-            phi = me.rad(lat);
-            c = 0.5 * lam;
-            d = Math.acos(Math.cos(phi) * Math.cos(c));
-            if (d !== 0) {
-                y = 1.0 / Math.sin(d);
-                x = 2.0 * d * Math.cos(phi) * Math.sin(c) * y;
-                y *= d * Math.sin(phi);
-            } else {
-                x = y = 0;
-            }
-            if (me.winkel) {
-                x = (x + lam * COSPHI1) * 0.5;
-                y = (y + phi) * 0.5;
-            }
-            return [x * 1000, y * -1000];
-        };
-
-        Aitoff.prototype._visible = function (lon, lat) {
-            return true;
-        };
-
-        return Aitoff;
-
-    })(PseudoCylindrical);
-
-    __proj['aitoff'] = Aitoff;
-
-    Winkel3 = (function (_super) {
-
-        __extends(Winkel3, _super);
-
-        Winkel3.title = "Winkel Tripel Projection";
-
-        function Winkel3(opts) {
-            Winkel3.__super__.constructor.call(this, opts);
-            this.winkel = true;
-        }
-
-        return Winkel3;
-
-    })(Aitoff);
-
-    __proj['winkel3'] = Winkel3;
-
-    Conic = (function (_super) {
-
-        __extends(Conic, _super);
-
-        Conic.title = "Conic Projection";
-
-        Conic.parameters = ['lon0', 'lat0', 'lat1', 'lat2'];
-
-        function Conic(opts) {
-            var self, _ref5, _ref6;
-            self = this;
-            Conic.__super__.constructor.call(this, opts);
-            self.lat1 = (_ref5 = opts.lat1) != null ? _ref5 : 30;
-            self.phi1 = self.rad(self.lat1);
-            self.lat2 = (_ref6 = opts.lat2) != null ? _ref6 : 50;
-            self.phi2 = self.rad(self.lat2);
-        }
-
-        Conic.prototype._visible = function (lon, lat) {
-            var self;
-            self = this;
-            return lat > self.minLat && lat < self.maxLat;
-        };
-
-        Conic.prototype._truncate = function (x, y) {
-            return [x, y];
-        };
-
-        Conic.prototype.clon = function (lon) {
-            lon -= this.lon0;
-            if (lon < -180) {
-                lon += 360;
-            } else if (lon > 180) {
-                lon -= 360;
-            }
-            return lon;
-        };
-
-        return Conic;
-
-    })(Proj);
-
-    LCC = (function (_super) {
-
-        __extends(LCC, _super);
-
-        /*
-         Lambert Conformal Conic Projection (spherical)
-         */
-
-
-        LCC.title = "Lambert Conformal Conic Projection";
-
-        function LCC(opts) {
-            var abs, c, cos, cosphi, m, n, pow, secant, self, sin, sinphi, tan, _ref5;
-            self = this;
-            LCC.__super__.constructor.call(this, opts);
-            m = Math;
-            _ref5 = [m.sin, m.cos, m.abs, m.log, m.tan, m.pow], sin = _ref5[0], cos = _ref5[1], abs = _ref5[2], log = _ref5[3], tan = _ref5[4], pow = _ref5[5];
-            self.n = n = sinphi = sin(self.phi1);
-            cosphi = cos(self.phi1);
-            secant = abs(self.phi1 - self.phi2) >= 1e-10;
-            if (secant) {
-                n = log(cosphi / cos(self.phi2)) / log(tan(self.QUARTERPI + 0.5 * self.phi2) / tan(self.QUARTERPI + 0.5 * self.phi1));
-            }
-            self.c = c = cosphi * pow(tan(self.QUARTERPI + .5 * self.phi1), n) / n;
-            if (abs(abs(self.phi0) - self.HALFPI) < 1e-10) {
-                self.rho0 = 0.0;
-            } else {
-                self.rho0 = c * pow(tan(self.QUARTERPI + .5 * self.phi0), -n);
-            }
-            self.minLat = -60;
-            self.maxLat = 85;
-        }
-
-        LCC.prototype.project = function (lon, lat) {
-            var abs, cos, lam, lam_, m, n, phi, pow, rho, self, sin, tan, x, y, _ref5;
-            self = this;
-            phi = self.rad(lat);
-            lam = self.rad(self.clon(lon));
-            m = Math;
-            _ref5 = [m.sin, m.cos, m.abs, m.log, m.tan, m.pow], sin = _ref5[0], cos = _ref5[1], abs = _ref5[2], log = _ref5[3], tan = _ref5[4], pow = _ref5[5];
-            n = self.n;
-            if (abs(abs(phi) - self.HALFPI) < 1e-10) {
-                rho = 0.0;
-            } else {
-                rho = self.c * pow(tan(self.QUARTERPI + 0.5 * phi), -n);
-            }
-            lam_ = lam * n;
-            x = 1000 * rho * sin(lam_);
-            y = 1000 * (self.rho0 - rho * cos(lam_));
-            return [x, y * -1];
-        };
-
-        return LCC;
-
-    })(Conic);
-
-    __proj['lcc'] = LCC;
-
-    PseudoConic = (function (_super) {
-
-        __extends(PseudoConic, _super);
-
-        function PseudoConic() {
-            return PseudoConic.__super__.constructor.apply(this, arguments);
-        }
-
-        return PseudoConic;
-
-    })(Conic);
-
-    /*
-     kartograph - a svg mapping library 
-     Copyright (C) 2011  Gregor Aisch
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation, either version 3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more detailme.
-
-     You should have received a copy of the GNU General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    View = (function () {
-        /*
-         2D coordinate transfomation
-         */
-
-        function View(bbox, width, height, padding, halign, valign) {
-            var me;
-            me = this;
-            me.bbox = bbox;
-            me.width = width;
-            me.padding = padding != null ? padding : 0;
-            me.halign = halign != null ? halign : 'center';
-            me.valign = valign != null ? valign : 'center';
-            me.height = height;
-            me.scale = Math.min((width - padding * 2) / bbox.width, (height - padding * 2) / bbox.height);
-        }
-
-        View.prototype.project = function (x, y) {
-            var bbox, h, me, s, w, xf, yf;
-            if (!(y != null)) {
-                y = x[1];
-                x = x[0];
-            }
-            me = this;
-            s = me.scale;
-            bbox = me.bbox;
-            h = me.height;
-            w = me.width;
-            xf = me.halign === "center" ? (w - bbox.width * s) * 0.5 : me.halign === "left" ? me.padding * s : w - (bbox.width - me.padding) * s;
-            yf = me.valign === "center" ? (h - bbox.height * s) * 0.5 : me.valign === "top" ? me.padding * s : 0;
-            x = (x - bbox.left) * s + xf;
-            y = (y - bbox.top) * s + yf;
-            return [x, y];
-        };
-
-        View.prototype.projectPath = function (path) {
-            var bbox, cont, contours, me, new_path, pcont, r, x, y, _i, _j, _len, _len1, _ref5, _ref6, _ref7, _ref8;
-            me = this;
-            if (path.type === "path") {
-                contours = [];
-                bbox = [99999, 99999, -99999, -99999];
-                _ref5 = path.contours;
-                for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
-                    pcont = _ref5[_i];
-                    cont = [];
-                    for (_j = 0, _len1 = pcont.length; _j < _len1; _j++) {
-                        _ref6 = pcont[_j], x = _ref6[0], y = _ref6[1];
-                        _ref7 = me.project(x, y), x = _ref7[0], y = _ref7[1];
-                        cont.push([x, y]);
-                        bbox[0] = Math.min(bbox[0], x);
-                        bbox[1] = Math.min(bbox[1], y);
-                        bbox[2] = Math.max(bbox[2], x);
-                        bbox[3] = Math.max(bbox[3], y);
-                    }
-                    contours.push(cont);
-                }
-                new_path = new kartograph.geom.Path(path.type, contours, path.closed);
-                new_path._bbox = bbox;
-                return new_path;
-            } else if (path.type === "circle") {
-                _ref8 = me.project(path.x, path.y), x = _ref8[0], y = _ref8[1];
-                r = path.r * me.scale;
-                return new kartograph.geom.Circle(x, y, r);
-            }
-        };
-
-        View.prototype.asBBox = function () {
-            var me;
-            me = this;
-            return new kartograph.BBox(0, 0, me.width, me.height);
-        };
-
-        return View;
-
-    })();
-
-    View.fromXML = function (xml) {
-        /*
-         constructs a view from XML
-         */
-
-        var bbox, bbox_xml, h, pad, w;
-        w = Number(xml.getAttribute('w'));
-        h = Number(xml.getAttribute('h'));
-        pad = Number(xml.getAttribute('padding'));
-        bbox_xml = xml.getElementsByTagName('bbox')[0];
-        bbox = BBox.fromXML(bbox_xml);
-        return new kartograph.View(bbox, w, h, pad);
-    };
-
-    kartograph.View = View;
-
-    /*
-     kartograph - a svg mapping library
-     Copyright (C) 2011  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    kartograph.Kartograph.prototype.dotgrid = function (opts) {
-        var anim, data, data_col, data_key, delay, dly, dotgrid, dotstyle, ds, dur, f, g, gridsize, id, layer, layer_id, me, path, pathData, paths, pd, row, size, sizes, x, y, _i, _j, _k, _l, _len, _len1, _len2, _len3, _m, _n, _ref10, _ref11, _ref12, _ref13, _ref14, _ref15, _ref16, _ref17, _ref5, _ref6, _ref7, _ref8, _ref9;
-        me = this;
-        layer_id = (_ref5 = opts.layer) != null ? _ref5 : me.layerIds[me.layerIds.length - 1];
-        if (!me.layers.hasOwnProperty(layer_id)) {
-            warn('dotgrid error: layer "' + layer_id + '" not found');
-            return;
-        }
-        layer = me.layers[layer_id];
-        data = opts.data;
-        data_col = opts.value;
-        data_key = opts.key;
-        pathData = {};
-        if ((data_key != null) && __type(data) === "array") {
-            for (_i = 0, _len = data.length; _i < _len; _i++) {
-                row = data[_i];
-                id = row[data_key];
-                pathData[String(id)] = row;
-            }
-        } else {
-            for (id in data) {
-                row = data[id];
-                pathData[String(id)] = row;
-            }
-        }
-        dotstyle = (_ref6 = opts.style) != null ? _ref6 : {
-            fill: 'black',
-            stroke: 'none'
-        };
-        sizes = opts.size;
-        gridsize = (_ref7 = opts.gridsize) != null ? _ref7 : 15;
-        dotgrid = (_ref8 = layer.dotgrid) != null ? _ref8 : layer.dotgrid = {
-            gridsize: gridsize,
-            grid: []
-        };
-        if (dotgrid.gridsize !== gridsize) {
-            _ref9 = dotgrid.grid;
-            for (_j = 0, _len1 = _ref9.length; _j < _len1; _j++) {
-                g = _ref9[_j];
-                if (g.shape != null) {
-                    g.shape.remove();
-                    g.shape = null;
-                }
-            }
-        }
-        if (gridsize > 0) {
-            if (dotgrid.grid.length === 0) {
-                for (x = _k = 0, _ref10 = me.viewport.width; 0 <= _ref10 ? _k <= _ref10 : _k >= _ref10; x = _k += gridsize) {
-                    for (y = _l = 0, _ref11 = me.viewport.height; 0 <= _ref11 ? _l <= _ref11 : _l >= _ref11; y = _l += gridsize) {
-                        g = {
-                            x: x + (Math.random() - 0.5) * gridsize * 0.2,
-                            y: y + (Math.random() - 0.5) * gridsize * 0.2,
-                            pathid: false
-                        };
-                        f = false;
-                        _ref12 = layer.pathsById;
-                        for (id in _ref12) {
-                            paths = _ref12[id];
-                            for (_m = 0, _len2 = paths.length; _m < _len2; _m++) {
-                                path = paths[_m];
-                                if (path.vpath.isInside(g.x, g.y)) {
-                                    f = true;
-                                    pd = (_ref13 = pathData[id]) != null ? _ref13 : null;
-                                    size = sizes(pd);
-                                    g.pathid = id;
-                                    g.shape = layer.paper.circle(g.x, g.y, 1);
-                                    break;
-                                }
-                            }
-                            if (f) {
-                                break;
-                            }
-                        }
-                        dotgrid.grid.push(g);
-                    }
-                }
-            }
-            _ref14 = dotgrid.grid;
-            for (_n = 0, _len3 = _ref14.length; _n < _len3; _n++) {
-                g = _ref14[_n];
-                if (g.pathid) {
-                    pd = (_ref15 = pathData[g.pathid]) != null ? _ref15 : null;
-                    size = sizes(pd);
-                    dur = (_ref16 = opts.duration) != null ? _ref16 : 0;
-                    delay = (_ref17 = opts.delay) != null ? _ref17 : 0;
-                    if (__type(delay) === "function") {
-                        dly = delay(pd);
-                    } else {
-                        dly = delay;
-                    }
-                    if (dur > 0 && Raphael.svg) {
-                        anim = Raphael.animation({
-                            r: size * 0.5
-                        }, dur);
-                        g.shape.animate(anim.delay(dly));
-                    } else {
-                        g.shape.attr({
-                            r: size * 0.5
-                        });
-                    }
-                    if (__type(dotstyle) === "function") {
-                        ds = dotstyle(pd);
-                    } else {
-                        ds = dotstyle;
-                    }
-                    g.shape.attr(ds);
-                }
-            }
-        }
-    };
-
-    /*
-     kartograph - a svg mapping library
-     Copyright (C) 2011  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    filter = (_ref5 = kartograph.filter) != null ? _ref5 : kartograph.filter = {};
-
-    filter.__knownFilter = {};
-
-    filter.__patternFills = 0;
-
-    MapLayer.prototype.SVG = function (el, attr) {
-        var key, val;
-        if (typeof el === "string") {
-            el = window.document.createElementNS("http://www.w3.org/2000/svg", el);
-        }
-        if (attr) {
-            for (key in attr) {
-                val = attr[key];
-                el.setAttribute(key, val);
-            }
-        }
-        return el;
-    };
-
-    kartograph.Kartograph.prototype.addFilter = function (id, type, params) {
-        var doc, fltr, me;
-        if (params == null) {
-            params = {};
-        }
-        me = this;
-        doc = window.document;
-        if (kartograph.filter[type] != null) {
-            fltr = new kartograph.filter[type](params).getFilter(id);
-        } else {
-            throw 'unknown filter type ' + type;
-        }
-        return me.paper.defs.appendChild(fltr);
-    };
-
-    MapLayer.prototype.applyFilter = function (filter_id) {
-        var me;
-        me = this;
-        return $('.' + me.id, me.paper.canvas).attr({
-            filter: 'url(#' + filter_id + ')'
-        });
-    };
-
-    MapLayer.prototype.applyTexture = function (url, filt, defCol) {
-        var lp, me, _i, _len, _ref6, _results;
-        if (filt == null) {
-            filt = false;
-        }
-        if (defCol == null) {
-            defCol = '#000';
-        }
-        me = this;
-        filter.__patternFills += 1;
-        _ref6 = me.paths;
-        _results = [];
-        for (_i = 0, _len = _ref6.length; _i < _len; _i++) {
-            lp = _ref6[_i];
-            if (!filt || filt(lp.data)) {
-                _results.push(lp.svgPath.attr({
-                    fill: 'url(' + url + ')'
-                }));
-            } else {
-                _results.push(lp.svgPath.attr('fill', defCol));
-            }
-        }
-        return _results;
-    };
-
-    Filter = (function () {
-        /* base class for all svg filter
-         */
-
-        function Filter(params) {
-            this.params = params != null ? params : {};
-        }
-
-        Filter.prototype.getFilter = function (id) {
-            var fltr, me;
-            me = this;
-            fltr = me.SVG('filter', {
-                id: id
-            });
-            me.buildFilter(fltr);
-            return fltr;
-        };
-
-        Filter.prototype._getFilter = function () {
-            throw "not implemented";
-        };
-
-        Filter.prototype.SVG = function (el, attr) {
-            var key, val;
-            if (typeof el === "string") {
-                el = window.document.createElementNS("http://www.w3.org/2000/svg", el);
-            }
-            if (attr) {
-                for (key in attr) {
-                    val = attr[key];
-                    el.setAttribute(key, val);
-                }
-            }
-            return el;
-        };
-
-        return Filter;
-
-    })();
-
-    BlurFilter = (function (_super) {
-
-        __extends(BlurFilter, _super);
-
-        function BlurFilter() {
-            return BlurFilter.__super__.constructor.apply(this, arguments);
-        }
-
-        /* simple gaussian blur filter
-         */
-
-
-        BlurFilter.prototype.buildFilter = function (fltr) {
-            var SVG, blur, me;
-            me = this;
-            SVG = me.SVG;
-            blur = SVG('feGaussianBlur', {
-                stdDeviation: me.params.size || 4,
-                result: 'blur'
-            });
-            return fltr.appendChild(blur);
-        };
-
-        return BlurFilter;
-
-    })(Filter);
-
-    filter.blur = BlurFilter;
-
-    GlowFilter = (function (_super) {
-
-        __extends(GlowFilter, _super);
-
-        function GlowFilter() {
-            return GlowFilter.__super__.constructor.apply(this, arguments);
-        }
-
-        /* combined class for outer and inner glow filter
-         */
-
-
-        GlowFilter.prototype.buildFilter = function (fltr) {
-            var alpha, blur, color, inner, knockout, me, rgb, strength, _ref10, _ref11, _ref6, _ref7, _ref8, _ref9;
-            me = this;
-            blur = (_ref6 = me.params.blur) != null ? _ref6 : 4;
-            strength = (_ref7 = me.params.strength) != null ? _ref7 : 1;
-            color = (_ref8 = me.params.color) != null ? _ref8 : '#D1BEB0';
-            if (typeof color === 'string') {
-                color = chroma.hex(color);
-            }
-            rgb = color.rgb;
-            inner = (_ref9 = me.params.inner) != null ? _ref9 : false;
-            knockout = (_ref10 = me.params.knockout) != null ? _ref10 : false;
-            alpha = (_ref11 = me.params.alpha) != null ? _ref11 : 1;
-            if (inner) {
-                me.innerGlow(fltr, blur, strength, rgb, alpha, knockout);
-            } else {
-                me.outerGlow(fltr, blur, strength, rgb, alpha, knockout);
-            }
-        };
-
-        GlowFilter.prototype.outerGlow = function (fltr, _blur, _strength, rgb, alpha, knockout) {
-            var SVG, blur, comp, mat, me, merge, morph;
-            me = this;
-            SVG = me.SVG;
-            mat = SVG('feColorMatrix', {
-                "in": 'SourceGraphic',
-                type: 'matrix',
-                values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0   0 0 0 1 0',
-                result: 'mask'
-            });
-            fltr.appendChild(mat);
-            if (_strength > 0) {
-                morph = SVG('feMorphology', {
-                    "in": 'mask',
-                    radius: _strength,
-                    operator: 'dilate',
-                    result: 'mask'
-                });
-                fltr.appendChild(morph);
-            }
-            mat = SVG('feColorMatrix', {
-                "in": 'mask',
-                type: 'matrix',
-                values: '0 0 0 0 ' + (rgb[0] / 255) + ' 0 0 0 0 ' + (rgb[1] / 255) + ' 0 0 0 0 ' + (rgb[2] / 255) + '  0 0 0 1 0',
-                result: 'r0'
-            });
-            fltr.appendChild(mat);
-            blur = SVG('feGaussianBlur', {
-                "in": 'r0',
-                stdDeviation: _blur,
-                result: 'r1'
-            });
-            fltr.appendChild(blur);
-            comp = SVG('feComposite', {
-                operator: 'out',
-                "in": 'r1',
-                in2: 'mask',
-                result: 'comp'
-            });
-            fltr.appendChild(comp);
-            merge = SVG('feMerge');
-            if (!knockout) {
-                merge.appendChild(SVG('feMergeNode', {
-                    'in': 'SourceGraphic'
-                }));
-            }
-            merge.appendChild(SVG('feMergeNode', {
-                'in': 'r1'
-            }));
-            return fltr.appendChild(merge);
-        };
-
-        GlowFilter.prototype.innerGlow = function (fltr, _blur, _strength, rgb, alpha, knockout) {
-            var SVG, blur, comp, mat, me, merge, morph;
-            me = this;
-            SVG = me.SVG;
-            log('innerglow');
-            mat = SVG('feColorMatrix', {
-                "in": 'SourceGraphic',
-                type: 'matrix',
-                values: '0 0 0 0 0   0 0 0 0 0   0 0 0 0 0   0 0 0 500 0',
-                result: 'mask'
-            });
-            fltr.appendChild(mat);
-            morph = SVG('feMorphology', {
-                "in": 'mask',
-                radius: _strength,
-                operator: 'erode',
-                result: 'r1'
-            });
-            fltr.appendChild(morph);
-            blur = SVG('feGaussianBlur', {
-                "in": 'r1',
-                stdDeviation: _blur,
-                result: 'r2'
-            });
-            fltr.appendChild(blur);
-            mat = SVG('feColorMatrix', {
-                type: 'matrix',
-                "in": 'r2',
-                values: '1 0 0 0 ' + (rgb[0] / 255) + ' 0 1 0 0 ' + (rgb[1] / 255) + ' 0 0 1 0 ' + (rgb[2] / 255) + ' 0 0 0 -1 1',
-                result: 'r3'
-            });
-            fltr.appendChild(mat);
-            comp = SVG('feComposite', {
-                operator: 'in',
-                "in": 'r3',
-                in2: 'mask',
-                result: 'comp'
-            });
-            fltr.appendChild(comp);
-            merge = SVG('feMerge');
-            if (!knockout) {
-                merge.appendChild(SVG('feMergeNode', {
-                    'in': 'SourceGraphic'
-                }));
-            }
-            merge.appendChild(SVG('feMergeNode', {
-                'in': 'comp'
-            }));
-            return fltr.appendChild(merge);
-        };
-
-        return GlowFilter;
-
-    })(Filter);
-
-    filter.glow = GlowFilter;
-
-    /*
-     kartograph - a svg mapping library
-     Copyright (C) 2011  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    kartograph.Kartograph.prototype.addGeoPath = function (points, cmds, className) {
-        var me, path, path_str;
-        if (cmds == null) {
-            cmds = [];
-        }
-        if (className == null) {
-            className = '';
-        }
-        /* converts a set of
-         */
-
-        me = this;
-        path_str = me.getGeoPathStr(points, cmds);
-        path = me.paper.path(path_str);
-        if (className !== '') {
-            path.node.setAttribute('class', className);
-        }
-        return path;
-    };
-
-    kartograph.Kartograph.prototype.getGeoPathStr = function (points, cmds) {
-        var cmd, i, me, path_str, pt, xy, _ref6;
-        if (cmds == null) {
-            cmds = [];
-        }
-        /* converts a set of
-         */
-
-        me = this;
-        if (type(cmds) === 'string') {
-            cmds = cmds.split("");
-        }
-        if (cmds.length === 0) {
-            cmds.push('M');
-        }
-        path_str = '';
-        for (i in points) {
-            pt = points[i];
-            cmd = (_ref6 = cmds[i]) != null ? _ref6 : 'L';
-            xy = me.lonlat2xy(pt);
-            if (isNaN(xy[0]) || isNaN(xy[1])) {
-                continue;
-            }
-            path_str += cmd + xy[0] + ',' + xy[1];
-        }
-        return path_str;
-    };
-
-    kartograph.Kartograph.prototype.addGeoPolygon = function (points, className) {
-        /* converts a set of
-         */
-
-        var cmds, i, me;
-        me = this;
-        cmds = ['M'];
-        for (i in points) {
-            cmds.push('L');
-        }
-        cmds.push('Z');
-        return me.addGeoPath(points, cmds, className);
-    };
-
-    /*
-     kartograph - a svg mapping library 
-     Copyright (C) 2011  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    PanAndZoomControl = (function () {
-
-        function PanAndZoomControl(map) {
-            this.zoomOut = __bind(this.zoomOut, this);
-
-            this.zoomIn = __bind(this.zoomIn, this);
-
-            var c, div, mdown, me, mup, zc, zcm, zcp;
-            me = this;
-            me.map = map;
-            c = map.container;
-            div = function (className, childNodes) {
-                var child, d, _i, _len;
-                if (childNodes == null) {
-                    childNodes = [];
-                }
-                d = $('<div class="' + className + '" />');
-                for (_i = 0, _len = childNodes.length; _i < _len; _i++) {
-                    child = childNodes[_i];
-                    d.append(child);
-                }
-                return d;
-            };
-            mdown = function (evt) {
-                return $(evt.target).addClass('md');
-            };
-            mup = function (evt) {
-                return $(evt.target).removeClass('md');
-            };
-            zcp = div('plus');
-            zcp.mousedown(mdown);
-            zcp.mouseup(mup);
-            zcp.click(me.zoomIn);
-            zcm = div('minus');
-            zcm.mousedown(mdown);
-            zcm.mouseup(mup);
-            zcm.click(me.zoomOut);
-            zc = div('zoom-control', [zcp, zcm]);
-            c.append(zc);
-        }
-
-        PanAndZoomControl.prototype.zoomIn = function (evt) {
-            var me;
-            me = this;
-            me.map.opts.zoom += 1;
-            return me.map.resize();
-        };
-
-        PanAndZoomControl.prototype.zoomOut = function (evt) {
-            var me;
-            me = this;
-            me.map.opts.zoom -= 1;
-            if (me.map.opts.zoom < 1) {
-                me.map.opts.zoom = 1;
-            }
-            return me.map.resize();
-        };
-
-        return PanAndZoomControl;
-
-    })();
-
-    /*
-     kartograph - a svg mapping library 
-     Copyright (C) 2011  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    Scale = (function () {
-        /* scales map values to [0..1]
-         */
-
-        function Scale(domain, prop, filter) {
-            var i, me, val, values,
-                _this = this;
-            if (domain == null) {
-                domain = [0, 1];
-            }
-            if (prop == null) {
-                prop = null;
-            }
-            if (filter == null) {
-                filter = null;
-            }
-            this.rangedScale = __bind(this.rangedScale, this);
-
-            this.scale = __bind(this.scale, this);
-
-            me = this;
-            values = [];
-            for (i in domain) {
-                if (__type(filter) === "function") {
-                    if (filter(domain[i]) === false) {
-                        continue;
-                    }
-                }
-                if (prop != null) {
-                    if (__type(prop) === "function") {
-                        val = prop(domain[i]);
-                    } else {
-                        val = domain[i][prop];
-                    }
-                } else {
-                    val = domain[i];
-                }
-                if (!isNaN(val)) {
-                    values.push(val);
-                }
-            }
-            values = values.sort(function (a, b) {
-                return a - b;
-            });
-            me.values = values;
-            me._range = [0, 1];
-            me.rangedScale.range = function (_r) {
-                me._range = _r;
-                return me.rangedScale;
-            };
-        }
-
-        Scale.prototype.scale = function (x) {
-            return x;
-        };
-
-        Scale.prototype.rangedScale = function (x) {
-            var me, r;
-            me = this;
-            x = me.scale(x);
-            r = me._range;
-            return x * (r[1] - r[0]) + r[0];
-        };
-
-        return Scale;
-
-    })();
-
-    LinearScale = (function (_super) {
-
-        __extends(LinearScale, _super);
-
-        function LinearScale() {
-            this.scale = __bind(this.scale, this);
-            return LinearScale.__super__.constructor.apply(this, arguments);
-        }
-
-        /* liniear scale
-         */
-
-
-        LinearScale.prototype.scale = function (x) {
-            var me, vals;
-            me = this;
-            vals = me.values;
-            return (x - vals[0]) / (vals[vals.length - 1] - vals[0]);
-        };
-
-        return LinearScale;
-
-    })(Scale);
-
-    LogScale = (function (_super) {
-
-        __extends(LogScale, _super);
-
-        function LogScale() {
-            this.scale = __bind(this.scale, this);
-            return LogScale.__super__.constructor.apply(this, arguments);
-        }
-
-        /* logatithmic scale
-         */
-
-
-        LogScale.prototype.scale = function (x) {
-            var me, vals;
-            me = this;
-            vals = me.values;
-            log = Math.log;
-            return (log(x) - log(vals[0])) / (log(vals[vals.length - 1]) - log(vals[0]));
-        };
-
-        return LogScale;
-
-    })(Scale);
-
-    SqrtScale = (function (_super) {
-
-        __extends(SqrtScale, _super);
-
-        function SqrtScale() {
-            this.scale = __bind(this.scale, this);
-            return SqrtScale.__super__.constructor.apply(this, arguments);
-        }
-
-        /* square root scale
-         */
-
-
-        SqrtScale.prototype.scale = function (x) {
-            var me, vals;
-            me = this;
-            vals = me.values;
-            return Math.sqrt((x - vals[0]) / (vals[vals.length - 1] - vals[0]));
-        };
-
-        return SqrtScale;
-
-    })(Scale);
-
-    QuantileScale = (function (_super) {
-
-        __extends(QuantileScale, _super);
-
-        function QuantileScale() {
-            this.scale = __bind(this.scale, this);
-            return QuantileScale.__super__.constructor.apply(this, arguments);
-        }
-
-        /* quantiles scale
-         */
-
-
-        QuantileScale.prototype.scale = function (x) {
-            var i, k, me, nv, v, vals;
-            me = this;
-            vals = me.values;
-            k = vals.length - 1;
-            for (i in vals) {
-                v = vals[Number(i)];
-                nv = vals[Number(i) + 1];
-                if (x === v) {
-                    return i / k;
-                }
-                if (i < k && x > v && x < nv) {
-                    return i / k + (x - v) / (nv - v);
-                }
-            }
-        };
-
-        return QuantileScale;
-
-    })(Scale);
-
-    kartograph.scale = {};
-
-    kartograph.scale.identity = function (s) {
-        return new Scale(domain, prop, filter).rangedScale;
-    };
-
-    kartograph.scale.linear = function (domain, prop, filter) {
-        return new LinearScale(domain, prop, filter).rangedScale;
-    };
-
-    kartograph.scale.log = function (domain, prop, filter) {
-        return new LogScale(domain, prop, filter).rangedScale;
-    };
-
-    kartograph.scale.sqrt = function (domain, prop, filter) {
-        return new SqrtScale(domain, prop, filter).rangedScale;
-    };
-
-    kartograph.scale.quantile = function (domain, prop, filter) {
-        return new QuantileScale(domain, prop, filter).rangedScale;
-    };
-
-    /*
-     kartograph - a svg mapping library
-     Copyright (C) 2011,2012  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    Symbol = (function () {
-        /* base class for all symbols
-         */
-
-        var me;
-
-        me = null;
-
-        function Symbol(opts) {
-            me = this;
-            me.location = opts.location;
-            me.data = opts.data;
-            me.map = opts.map;
-            me.layers = opts.layers;
-            me.key = opts.key;
-            me.x = opts.x;
-            me.y = opts.y;
-        }
-
-        Symbol.prototype.init = function () {
-            return me;
-        };
-
-        Symbol.prototype.overlaps = function (symbol) {
-            return false;
-        };
-
-        Symbol.prototype.update = function (opts) {
-            /* once the data has changed
-             */
-            return me;
-        };
-
-        Symbol.prototype.nodes = function () {
-            return [];
-        };
-
-        Symbol.prototype.clear = function () {
-            return me;
-        };
-
-        return Symbol;
-
-    })();
-
-    kartograph.Symbol = Symbol;
-
-    /*
-     kartograph - a svg mapping library
-     Copyright (C) 2011,2012  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    SymbolGroup = (function () {
-        /* symbol groups
-
-         Usage:
-         new $K.SymbolGroup(options);
-         map.addSymbols(options)
-         */
-
-        var me;
-
-        me = null;
-
-        function SymbolGroup(opts) {
-            this._initTooltips = __bind(this._initTooltips, this);
-
-            this._noverlap = __bind(this._noverlap, this);
-
-            this._kMeans = __bind(this._kMeans, this);
-
-            var SymbolType, d, i, id, l, layer, nid, optional, p, required, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref6, _ref7;
-            me = this;
-            required = ['data', 'location', 'type', 'map'];
-            optional = ['filter', 'tooltip', 'click', 'delay', 'sortBy', 'clustering', 'aggregate', 'clusteringOpts', 'mouseenter', 'mouseleave'];
-            for (_i = 0, _len = required.length; _i < _len; _i++) {
-                p = required[_i];
-                if (opts[p] != null) {
-                    me[p] = opts[p];
-                } else {
-                    throw "SymbolGroup: missing argument '" + p + "'";
-                }
-            }
-            for (_j = 0, _len1 = optional.length; _j < _len1; _j++) {
-                p = optional[_j];
-                if (opts[p] != null) {
-                    me[p] = opts[p];
-                }
-            }
-            SymbolType = me.type;
-            if (!(SymbolType != null)) {
-                warn('could not resolve symbol type', me.type);
-                return;
-            }
-            _ref6 = SymbolType.props;
-            for (_k = 0, _len2 = _ref6.length; _k < _len2; _k++) {
-                p = _ref6[_k];
-                if (opts[p] != null) {
-                    me[p] = opts[p];
-                }
-            }
-            me.layers = {
-                mapcanvas: me.map.paper
-            };
-            _ref7 = SymbolType.layers;
-            for (_l = 0, _len3 = _ref7.length; _l < _len3; _l++) {
-                l = _ref7[_l];
-                nid = SymbolGroup._layerid++;
-                id = 'sl_' + nid;
-                if (l.type === 'svg') {
-                    layer = me.map.createSVGLayer(id);
-                } else if (l.type === 'html') {
-                    layer = me.map.createHTMLLayer(id);
-                }
-                me.layers[l.id] = layer;
-            }
-            me.symbols = [];
-            for (i in me.data) {
-                d = me.data[i];
-                if (__type(me.filter) === "function") {
-                    if (me.filter(d, i)) {
-                        me.add(d, i);
-                    }
-                } else {
-                    me.add(d, i);
-                }
-            }
-            me.layout();
-            me.render();
-            me.map.addSymbolGroup(me);
-        }
-
-        SymbolGroup.prototype.add = function (data, key) {
-            /* adds a new symbol to this group
-             */
-
-            var SymbolType, ll, p, sprops, symbol, _i, _len, _ref6;
-            me = this;
-            SymbolType = me.type;
-            ll = me._evaluate(me.location, data, key);
-            if (__type(ll) === 'array') {
-                ll = new kartograph.LonLat(ll[0], ll[1]);
-            }
-            sprops = {
-                layers: me.layers,
-                location: ll,
-                data: data,
-                key: key != null ? key : me.symbols.length,
-                map: me.map
-            };
-            _ref6 = SymbolType.props;
-            for (_i = 0, _len = _ref6.length; _i < _len; _i++) {
-                p = _ref6[_i];
-                if (me[p] != null) {
-                    sprops[p] = me._evaluate(me[p], data, key);
-                }
-            }
-            symbol = new SymbolType(sprops);
-            me.symbols.push(symbol);
-            return symbol;
-        };
-
-        SymbolGroup.prototype.layout = function () {
-            var layer_id, ll, path, path_id, s, xy, _i, _len, _ref6, _ref7;
-            _ref6 = me.symbols;
-            for (_i = 0, _len = _ref6.length; _i < _len; _i++) {
-                s = _ref6[_i];
-                ll = s.location;
-                if (__type(ll) === 'string') {
-                    _ref7 = ll.split('.'), layer_id = _ref7[0], path_id = _ref7[1];
-                    path = me.map.getLayerPath(layer_id, path_id);
-                    if (path != null) {
-                        xy = me.map.viewBC.project(path.path.centroid());
-                    } else {
-                        warn('could not find layer path ' + layer_id + '.' + path_id);
-                        continue;
-                    }
-                } else {
-                    xy = me.map.lonlat2xy(ll);
-                }
-                s.x = xy[0];
-                s.y = xy[1];
-            }
-            if (me.clustering === 'k-means') {
-                me._kMeans();
-            } else if (me.clustering === 'noverlap') {
-                me._noverlap();
-            }
-            return me;
-        };
-
-        SymbolGroup.prototype.render = function () {
-            var node, s, sortBy, sortDir, _i, _j, _len, _len1, _ref6, _ref7, _ref8;
-            me = this;
-            if (me.sortBy) {
-                sortDir = 'asc';
-                if (__type(me.sortBy) === "string") {
-                    me.sortBy = me.sortBy.split(' ', 2);
-                    sortBy = me.sortBy[0];
-                    sortDir = (_ref6 = me.sortBy[1]) != null ? _ref6 : 'asc';
-                }
-                me.symbols = me.symbols.sort(function (a, b) {
-                    var m, va, vb;
-                    if (__type(me.sortBy) === "function") {
-                        va = me.sortBy(a.data, a);
-                        vb = me.sortBy(b.data, b);
-                    } else {
-                        va = a[sortBy];
-                        vb = b[sortBy];
-                    }
-                    if (va === vb) {
-                        return 0;
-                    }
-                    m = sortDir === 'asc' ? 1 : -1;
-                    if (va > vb) {
-                        return 1 * m;
-                    } else {
-                        return -1 * m;
-                    }
-                });
-            }
-            _ref7 = me.symbols;
-            for (_i = 0, _len = _ref7.length; _i < _len; _i++) {
-                s = _ref7[_i];
-                s.render();
-                _ref8 = s.nodes();
-                for (_j = 0, _len1 = _ref8.length; _j < _len1; _j++) {
-                    node = _ref8[_j];
-                    node.symbol = s;
-                }
-            }
-            if (__type(me.tooltip) === "function") {
-                me._initTooltips();
-            }
-            $.each(['click', 'mouseenter', 'mouseleave'], function (i, evt) {
-                var _k, _len2, _ref9, _results;
-                if (__type(me[evt]) === "function") {
-                    _ref9 = me.symbols;
-                    _results = [];
-                    for (_k = 0, _len2 = _ref9.length; _k < _len2; _k++) {
-                        s = _ref9[_k];
-                        _results.push((function () {
-                            var _l, _len3, _ref10, _results1,
-                                _this = this;
-                            _ref10 = s.nodes();
-                            _results1 = [];
-                            for (_l = 0, _len3 = _ref10.length; _l < _len3; _l++) {
-                                node = _ref10[_l];
-                                _results1.push($(node)[evt](function (e) {
-                                    var tgt;
-                                    tgt = e.target;
-                                    while (!tgt.symbol) {
-                                        tgt = $(tgt).parent().get(0);
-                                    }
-                                    e.stopPropagation();
-                                    return me[evt](tgt.symbol.data, tgt.symbol, e);
-                                }));
-                            }
-                            return _results1;
-                        }).call(this));
-                    }
-                    return _results;
-                }
-            });
-            return me;
-        };
-
-        SymbolGroup.prototype.tooltips = function (cb) {
-            me = this;
-            me.tooltips = cb;
-            me._initTooltips();
-            return me;
-        };
-
-        SymbolGroup.prototype.remove = function (filter) {
-            var id, kept, layer, s, _i, _len, _ref6, _ref7, _results;
-            me = this;
-            kept = [];
-            _ref6 = me.symbols;
-            for (_i = 0, _len = _ref6.length; _i < _len; _i++) {
-                s = _ref6[_i];
-                if ((filter != null) && !filter(s.data)) {
-                    kept.push(s);
-                    continue;
-                }
-                try {
-                    s.clear();
-                } catch (error) {
-                    warn('error: symbolgroup.remove');
-                }
-            }
-            if (!(filter != null)) {
-                _ref7 = me.layers;
-                _results = [];
-                for (id in _ref7) {
-                    layer = _ref7[id];
-                    if (id !== "mapcanvas") {
-                        _results.push(layer.remove());
-                    } else {
-                        _results.push(void 0);
-                    }
-                }
-                return _results;
-            } else {
-                return me.symbols = kept;
-            }
-        };
-
-        SymbolGroup.prototype._evaluate = function (prop, data, key) {
-            /* evaluates a property function or returns a static value
-             */
-
-            var val;
-            if (__type(prop) === 'function') {
-                return val = prop(data, key);
-            } else {
-                return val = prop;
-            }
-        };
-
-        SymbolGroup.prototype._kMeans = function () {
-            /*
-             layouts symbols in this group, eventually adds new 'grouped' symbols
-             map.addSymbols({
-             layout: "k-means",
-             aggregate: function(data) {
-             // compresses a list of data objects into a single one
-             // typically you want to calculate the mean position, sum value or something here
-             }
-             })
-             */
-
-            var SymbolType, cluster, d, i, mean, means, out, p, s, size, sprops, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref6, _ref7, _ref8, _ref9;
-            me = this;
-            if ((_ref6 = me.osymbols) == null) {
-                me.osymbols = me.symbols;
-            }
-            SymbolType = me.type;
-            if (me.clusteringOpts != null) {
-                size = me.clusteringOpts.size;
-            }
-            if (size == null) {
-                size = 64;
-            }
-            cluster = kmeans().iterations(16).size(size);
-            _ref7 = me.osymbols;
-            for (_i = 0, _len = _ref7.length; _i < _len; _i++) {
-                s = _ref7[_i];
-                cluster.add({
-                    x: s.x,
-                    y: s.y
-                });
-            }
-            means = cluster.means();
-            out = [];
-            for (_j = 0, _len1 = means.length; _j < _len1; _j++) {
-                mean = means[_j];
-                if (mean.size === 0) {
-                    continue;
-                }
-                d = [];
-                _ref8 = mean.indices;
-                for (_k = 0, _len2 = _ref8.length; _k < _len2; _k++) {
-                    i = _ref8[_k];
-                    d.push(me.osymbols[i].data);
-                }
-                d = me.aggregate(d);
-                sprops = {
-                    layers: me.layers,
-                    location: false,
-                    data: d,
-                    map: me.map
-                };
-                _ref9 = SymbolType.props;
-                for (_l = 0, _len3 = _ref9.length; _l < _len3; _l++) {
-                    p = _ref9[_l];
-                    if (me[p] != null) {
-                        sprops[p] = me._evaluate(me[p], d);
-                    }
-                }
-                s = new SymbolType(sprops);
-                s.x = mean.x;
-                s.y = mean.y;
-                out.push(s);
-            }
-            return me.symbols = out;
-        };
-
-        SymbolGroup.prototype._noverlap = function () {
-            var SymbolType, b0, b1, d, dx, dy, i, intersects, iterations, l, l0, l1, maxRatio, out, p, q, r, r0, r1, rad0, rad1, s, s0, s1, sprops, symbols, t0, t1, tolerance, w, x, y, _i, _j, _k, _l, _len, _len1, _len2, _m, _n, _ref10, _ref11, _ref6, _ref7, _ref8, _ref9;
-            me = this;
-            if ((_ref6 = me.osymbols) == null) {
-                me.osymbols = me.symbols;
-            }
-            iterations = 3;
-            SymbolType = me.type;
-            if (__indexOf.call(SymbolType.props, 'radius') < 0) {
-                warn('noverlap layout only available for symbols with property "radius"');
-                return;
-            }
-            symbols = me.osymbols.slice();
-            if (me.clusteringOpts != null) {
-                tolerance = me.clusteringOpts.tolerance;
-                maxRatio = me.clusteringOpts.maxRatio;
-            }
-            if (tolerance == null) {
-                tolerance = 0.05;
-            }
-            if (maxRatio == null) {
-                maxRatio = 0.8;
-            }
-            for (i = _i = 0, _ref7 = iterations - 1; 0 <= _ref7 ? _i <= _ref7 : _i >= _ref7; i = 0 <= _ref7 ? ++_i : --_i) {
-                symbols.sort(function (a, b) {
-                    return b.radius - a.radius;
-                });
-                l = symbols.length;
-                out = [];
-                for (p = _j = 0, _ref8 = l - 3; 0 <= _ref8 ? _j <= _ref8 : _j >= _ref8; p = 0 <= _ref8 ? ++_j : --_j) {
-                    s0 = symbols[p];
-                    if (!s0) {
-                        continue;
-                    }
-                    rad0 = s0.radius * (1 - tolerance);
-                    l0 = s0.x - rad0;
-                    r0 = s0.x + rad0;
-                    t0 = s0.y - rad0;
-                    b0 = s0.y + rad0;
-                    intersects = [];
-                    for (q = _k = _ref9 = p + 1, _ref10 = l - 2; _ref9 <= _ref10 ? _k <= _ref10 : _k >= _ref10; q = _ref9 <= _ref10 ? ++_k : --_k) {
-                        s1 = symbols[q];
-                        if (!s1) {
-                            continue;
-                        }
-                        rad1 = s1.radius;
-                        l1 = s1.x - rad1;
-                        r1 = s1.x + rad1;
-                        t1 = s1.y - rad1;
-                        b1 = s1.y + rad1;
-                        if (rad1 / s0.radius < maxRatio) {
-                            if (!(r0 < l1 || r1 < l0) && !(b0 < t1 || b1 < t0)) {
-                                dx = s1.x - s0.x;
-                                dy = s1.y - s0.y;
-                                if (dx * dx + dy * dy < (rad0 + rad1) * (rad0 + rad1)) {
-                                    intersects.push(q);
-                                }
-                            }
-                        }
-                    }
-                    if (intersects.length > 0) {
-                        d = [s0.data];
-                        r = s0.radius * s0.radius;
-                        for (_l = 0, _len = intersects.length; _l < _len; _l++) {
-                            i = intersects[_l];
-                            d.push(symbols[i].data);
-                            r += symbols[i].radius * symbols[i].radius;
-                        }
-                        d = me.aggregate(d);
-                        sprops = {
-                            layers: me.layers,
-                            location: false,
-                            data: d,
-                            map: me.map
-                        };
-                        _ref11 = SymbolType.props;
-                        for (_m = 0, _len1 = _ref11.length; _m < _len1; _m++) {
-                            p = _ref11[_m];
-                            if (me[p] != null) {
-                                sprops[p] = me._evaluate(me[p], d);
-                            }
-                        }
-                        s = new SymbolType(sprops);
-                        w = s0.radius * s0.radius / r;
-                        x = s0.x * w;
-                        y = s0.y * w;
-                        for (_n = 0, _len2 = intersects.length; _n < _len2; _n++) {
-                            i = intersects[_n];
-                            s1 = symbols[i];
-                            w = s1.radius * s1.radius / r;
-                            x += s1.x * w;
-                            y += s1.y * w;
-                            symbols[i] = void 0;
-                        }
-                        s.x = x;
-                        s.y = y;
-                        symbols[p] = void 0;
-                        out.push(s);
-                    } else {
-                        out.push(s0);
-                    }
-                }
-                symbols = out;
-            }
-            return me.symbols = symbols;
-        };
-
-        SymbolGroup.prototype._initTooltips = function () {
-            var cfg, node, s, tooltips, tt, _i, _j, _len, _len1, _ref6, _ref7;
-            me = this;
-            tooltips = me.tooltip;
-            _ref6 = me.symbols;
-            for (_i = 0, _len = _ref6.length; _i < _len; _i++) {
-                s = _ref6[_i];
-                cfg = {
-                    position: {
-                        target: 'mouse',
-                        viewport: $(window),
-                        adjust: {
-                            x: 7,
-                            y: 7
-                        }
-                    },
-                    show: {
-                        delay: 20
-                    },
-                    content: {},
-                    events: {
-                        show: function (evt, api) {
-                            return $('.qtip').filter(function () {
-                                return this !== api.elements.tooltip.get(0);
-                            }).hide();
-                        }
-                    }
-                };
-                tt = tooltips(s.data, s.key);
-                if (__type(tt) === "string") {
-                    cfg.content.text = tt;
-                } else if (__type(tt) === "array") {
-                    cfg.content.title = tt[0];
-                    cfg.content.text = tt[1];
-                }
-                _ref7 = s.nodes();
-                for (_j = 0, _len1 = _ref7.length; _j < _len1; _j++) {
-                    node = _ref7[_j];
-                    $(node).qtip(cfg);
-                }
-            }
-        };
-
-        SymbolGroup.prototype.onResize = function () {
-            var s, _i, _len, _ref6;
-            me = this;
-            me.layout();
-            _ref6 = me.symbols;
-            for (_i = 0, _len = _ref6.length; _i < _len; _i++) {
-                s = _ref6[_i];
-                s.update();
-            }
-        };
-
-        SymbolGroup.prototype.update = function (opts, duration, easing) {
-            var p, s, _i, _j, _len, _len1, _ref6, _ref7;
-            me = this;
-            if (!(opts != null)) {
-                opts = {};
-            }
-            _ref6 = me.symbols;
-            for (_i = 0, _len = _ref6.length; _i < _len; _i++) {
-                s = _ref6[_i];
-                _ref7 = me.type.props;
-                for (_j = 0, _len1 = _ref7.length; _j < _len1; _j++) {
-                    p = _ref7[_j];
-                    if (opts[p] != null) {
-                        s[p] = me._evaluate(opts[p], s.data);
-                    } else if (me[p] != null) {
-                        s[p] = me._evaluate(me[p], s.data);
-                    }
-                }
-                s.update(duration, easing);
-            }
-            return me;
-        };
-
-        return SymbolGroup;
-
-    })();
-
-    SymbolGroup._layerid = 0;
-
-    kartograph.SymbolGroup = SymbolGroup;
-
-    kartograph.Kartograph.prototype.addSymbols = function (opts) {
-        opts.map = this;
-        return new SymbolGroup(opts);
-    };
-
-
-    /*
-     Copyright (c) 2010, SimpleGeo and Stamen Design
-     All rights reserved.
-
-     Redistribution and use in source and binary forms, with or without
-     modification, are permitted provided that the following conditions are met:
-     * Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-     * Neither the name of SimpleGeo nor the
-     names of its contributors may be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-     ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-     DISCLAIMED. IN NO EVENT SHALL SIMPLEGEO BE LIABLE FOR ANY
-     DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-     (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-     ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-     */
-
-// k-means clustering
-    function kmeans() {
-        var kmeans = {},
-            points = [],
-            iterations = 1,
-            size = 1;
-
-        kmeans.size = function (x) {
-            if (!arguments.length) return size;
-            size = x;
-            return kmeans;
-        };
-
-        kmeans.iterations = function (x) {
-            if (!arguments.length) return iterations;
-            iterations = x;
-            return kmeans;
-        };
-
-        kmeans.add = function (x) {
-            points.push(x);
-            return kmeans;
-        };
-
-        kmeans.means = function () {
-            var means = [],
-                seen = {},
-                n = Math.min(size, points.length);
-
-            // Initialize k random (unique!) means.
-            for (var i = 0, m = 2 * n; i < m; i++) {
-                var p = points[~~(Math.random() * points.length)], id = p.x + "/" + p.y;
-                if (!(id in seen)) {
-                    seen[id] = 1;
-                    if (means.push({x: p.x, y: p.y}) >= n) break;
-                }
-            }
-            n = means.length;
-
-            // For each iteration, create a kd-tree of the current means.
-            for (var j = 0; j < iterations; j++) {
-                var kd = kdtree().points(means);
-
-                // Clear the state.
-                for (var i = 0; i < n; i++) {
-                    var mean = means[i];
-                    mean.sumX = 0;
-                    mean.sumY = 0;
-                    mean.size = 0;
-                    mean.points = [];
-                    mean.indices = [];
-                }
-
-                // Find the mean closest to each point.
-                for (var i = 0; i < points.length; i++) {
-                    var point = points[i], mean = kd.find(point);
-                    mean.sumX += point.x;
-                    mean.sumY += point.y;
-                    mean.size++;
-                    mean.points.push(point);
-                    mean.indices.push(i);
-                }
-
-                // Compute the new means.
-                for (var i = 0; i < n; i++) {
-                    var mean = means[i];
-                    if (!mean.size) continue; // overlapping mean
-                    mean.x = mean.sumX / mean.size;
-                    mean.y = mean.sumY / mean.size;
-                }
-            }
-
-            return means;
-        };
-
-        return kmeans;
-    }
-
-// kd-tree
-    function kdtree() {
-        var kdtree = {},
-            axes = ["x", "y"],
-            root,
-            points = [];
-
-        kdtree.axes = function (x) {
-            if (!arguments.length) return axes;
-            axes = x;
-            return kdtree;
-        };
-
-        kdtree.points = function (x) {
-            if (!arguments.length) return points;
-            points = x;
-            root = null;
-            return kdtree;
-        };
-
-        kdtree.find = function (x) {
-            return find(kdtree.root(), x, root).point;
-        };
-
-        kdtree.root = function (x) {
-            return root || (root = node(points, 0));
-        };
-
-        function node(points, depth) {
-            if (!points.length) return;
-            var axis = axes[depth % axes.length], median = points.length >> 1;
-            points.sort(order(axis)); // could use random sample to speed up here
-            return {
-                axis: axis,
-                point: points[median],
-                left: node(points.slice(0, median), depth + 1),
-                right: node(points.slice(median + 1), depth + 1)
-            };
-        }
-
-        function distance(a, b) {
-            var sum = 0;
-            for (var i = 0; i < axes.length; i++) {
-                var axis = axes[i], d = a[axis] - b[axis];
-                sum += d * d;
-            }
-            return sum;
-        }
-
-        function order(axis) {
-            return function (a, b) {
-                a = a[axis];
-                b = b[axis];
-                return a < b ? -1 : a > b ? 1 : 0;
-            };
-        }
-
-        function find(node, point, best) {
-            if (distance(node.point, point) < distance(best.point, point)) best = node;
-            if (node.left) best = find(node.left, point, best);
-            if (node.right) {
-                var d = node.point[node.axis] - point[node.axis];
-                if (d * d < distance(best.point, point)) best = find(node.right, point, best);
-            }
-            return best;
-        }
-
-        return kdtree;
-    }
-    ;
-
-
-    kartograph.dorlingLayout = function (symbolgroup, iterations) {
-        var A, B, apply, d, ds, dx, dy, f, i, j, nodes, r, rd, rs, _i;
-        if (iterations == null) {
-            iterations = 40;
-        }
-        nodes = [];
-        $.each(symbolgroup.symbols, function (i, s) {
-            return nodes.push({
-                i: i,
-                x: s.path.attrs.cx,
-                y: s.path.attrs.cy,
-                r: s.path.attrs.r
-            });
-        });
-        nodes.sort(function (a, b) {
-            return b.r - a.r;
-        });
-        apply = function () {
-            var n, _i, _len;
-            for (_i = 0, _len = nodes.length; _i < _len; _i++) {
-                n = nodes[_i];
-                symbolgroup.symbols[n.i].path.attr({
-                    cx: n.x,
-                    cy: n.y
-                });
-            }
-        };
-        for (r = _i = 1; 1 <= iterations ? _i <= iterations : _i >= iterations; r = 1 <= iterations ? ++_i : --_i) {
-            for (i in nodes) {
-                for (j in nodes) {
-                    if (j > i) {
-                        A = nodes[i];
-                        B = nodes[j];
-                        if (A.x + A.r < B.x - B.r || A.x - A.r > B.x + B.r) {
-                            continue;
-                        }
-                        if (A.y + A.r < B.y - B.r || A.y - A.r > B.y + B.r) {
-                            continue;
-                        }
-                        dx = A.x - B.x;
-                        dy = A.y - B.y;
-                        ds = dx * dx + dy * dy;
-                        rd = A.r + B.r;
-                        rs = rd * rd;
-                        if (ds < rs) {
-                            d = Math.sqrt(ds);
-                            f = 10 / d;
-                            A.x += dx * f * (1 - (A.r / rd));
-                            A.y += dy * f * (1 - (A.r / rd));
-                            B.x -= dx * f * (1 - (B.r / rd));
-                            B.y -= dy * f * (1 - (B.r / rd));
-                        }
-                    }
-                }
-            }
-        }
-        return apply();
-    };
-
-    /*
-     kartograph - a svg mapping library
-     Copyright (C) 2011,2012  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    Bubble = (function (_super) {
-
-        __extends(Bubble, _super);
-
-        function Bubble(opts) {
-            this.nodes = __bind(this.nodes, this);
-
-            this.clear = __bind(this.clear, this);
-
-            this.update = __bind(this.update, this);
-
-            this.render = __bind(this.render, this);
-
-            this.overlaps = __bind(this.overlaps, this);
-
-            var me, _ref6, _ref7;
-            me = this;
-            Bubble.__super__.constructor.call(this, opts);
-            me.radius = (_ref6 = opts.radius) != null ? _ref6 : 4;
-            me.style = opts.style;
-            me.attrs = opts.attrs;
-            me.title = opts.title;
-            me["class"] = (_ref7 = opts["class"]) != null ? _ref7 : 'bubble';
-        }
-
-        Bubble.prototype.overlaps = function (bubble) {
-            var dx, dy, me, r1, r2, x1, x2, y1, y2, _ref6, _ref7;
-            me = this;
-            _ref6 = [me.x, me.y, me.radius], x1 = _ref6[0], y1 = _ref6[1], r1 = _ref6[2];
-            _ref7 = [bubble.x, bubble.y, bubble.radius], x2 = _ref7[0], y2 = _ref7[1], r2 = _ref7[2];
-            if (x1 - r1 > x2 + r2 || x1 + r1 < x2 - r2 || y1 - r1 > y2 + r2 || y1 + r1 < y2 - r2) {
-                return false;
-            }
-            dx = x1 - x2;
-            dy = y1 - y2;
-            if (dx * dx + dy * dy > (r1 + r2) * (r1 + r2)) {
-                return false;
-            }
-            return true;
-        };
-
-        Bubble.prototype.render = function (layers) {
-            var me;
-            me = this;
-            if (!(me.path != null)) {
-                me.path = me.layers.mapcanvas.circle(me.x, me.y, me.radius);
-            }
-            me.update();
-            me.map.applyCSS(me.path);
-            return me;
-        };
-
-        Bubble.prototype.update = function (duration, easing) {
-            var attrs, me, path;
-            if (duration == null) {
-                duration = false;
-            }
-            if (easing == null) {
-                easing = 'expo-out';
-            }
-            me = this;
-            path = me.path;
-            attrs = {
-                cx: me.x,
-                cy: me.y,
-                r: me.radius
-            };
-            if (me.attrs != null) {
-                attrs = $.extend(attrs, me.attrs);
-            }
-            if (!duration) {
-                path.attr(attrs);
-            } else {
-                path.animate(attrs, duration, easing);
-            }
-            if (path.node != null) {
-                if (me.style != null) {
-                    path.node.setAttribute('style', me.style);
-                }
-                if (me["class"] != null) {
-                    path.node.setAttribute('class', me["class"]);
-                }
-            }
-            if (me.title != null) {
-                path.attr('title', me.title);
-            }
-            return me;
-        };
-
-        Bubble.prototype.clear = function () {
-            var me;
-            me = this;
-            me.path.remove();
-            return me;
-        };
-
-        Bubble.prototype.nodes = function () {
-            var me;
-            me = this;
-            return [me.path.node];
-        };
-
-        return Bubble;
-
-    })(Symbol);
-
-    Bubble.props = ['radius', 'style', 'class', 'title', 'attrs'];
-
-    Bubble.layers = [];
-
-    kartograph.Bubble = Bubble;
-
-    /*
-     kartograph - a svg mapping library 
-     Copyright (C) 2011,2012  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    Icon = (function (_super) {
-
-        __extends(Icon, _super);
-
-        function Icon(opts) {
-            var me, _ref10, _ref6, _ref7, _ref8, _ref9;
-            me = this;
-            Icon.__super__.constructor.call(this, opts);
-            me.icon = (_ref6 = opts.icon) != null ? _ref6 : '';
-            me.offset = (_ref7 = opts.offset) != null ? _ref7 : [0, 0];
-            me.iconsize = (_ref8 = opts.iconsize) != null ? _ref8 : [10, 10];
-            me["class"] = (_ref9 = opts["class"]) != null ? _ref9 : '';
-            me.title = (_ref10 = opts.title) != null ? _ref10 : '';
-        }
-
-        Icon.prototype.render = function (layers) {
-            var cont, me;
-            me = this;
-            cont = me.map.container;
-            me.img = $('<img />');
-            me.img.attr({
-                src: me.icon,
-                title: me.title,
-                alt: me.title,
-                width: me.iconsize[0],
-                height: me.iconsize[1]
-            });
-            me.img.addClass(me["class"]);
-            me.img.css({
-                position: 'absolute',
-                'z-index': 1000,
-                cursor: 'pointer'
-            });
-            me.img[0].symbol = me;
-            cont.append(me.img);
-            return me.update();
-        };
-
-        Icon.prototype.update = function () {
-            var me;
-            me = this;
-            return me.img.css({
-                left: (me.x + me.offset[0]) + 'px',
-                top: (me.y + me.offset[1]) + 'px'
-            });
-        };
-
-        Icon.prototype.clear = function () {
-            var me;
-            me = this;
-            me.img.remove();
-            return me;
-        };
-
-        Icon.prototype.nodes = function () {
-            var me;
-            me = this;
-            return [me.img];
-        };
-
-        return Icon;
-
-    })(kartograph.Symbol);
-
-    Icon.props = ['icon', 'offset', 'class', 'title', 'iconsize'];
-
-    Icon.layers = [];
-
-    kartograph.Icon = Icon;
-
-    /*
-     kartograph - a svg mapping library
-     Copyright (C) 2011,2012  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    SvgLabel = (function (_super) {
-
-        __extends(SvgLabel, _super);
-
-        function SvgLabel(opts) {
-            var me, _ref6, _ref7, _ref8, _ref9;
-            me = this;
-            SvgLabel.__super__.constructor.call(this, opts);
-            me.text = (_ref6 = opts.text) != null ? _ref6 : '';
-            me.style = (_ref7 = opts.style) != null ? _ref7 : '';
-            me["class"] = (_ref8 = opts["class"]) != null ? _ref8 : '';
-            me.offset = (_ref9 = opts.offset) != null ? _ref9 : [0, 0];
-        }
-
-        SvgLabel.prototype.render = function (layers) {
-            var lbl, me;
-            me = this;
-            me.lbl = lbl = me.layers.mapcanvas.text(me.x, me.y, me.text);
-            me.update();
-            return me;
-        };
-
-        SvgLabel.prototype.update = function () {
-            var me;
-            me = this;
-            me.lbl.attr({
-                x: me.x + me.offset[0],
-                y: me.y + me.offset[1]
-            });
-            me.lbl.node.setAttribute('style', me.style);
-            return me.lbl.node.setAttribute('class', me["class"]);
-        };
-
-        SvgLabel.prototype.clear = function () {
-            var me;
-            me = this;
-            me.lbl.remove();
-            return me;
-        };
-
-        SvgLabel.prototype.nodes = function () {
-            var me;
-            me = this;
-            return [me.lbl.node];
-        };
-
-        return SvgLabel;
-
-    })(kartograph.Symbol);
-
-    SvgLabel.props = ['text', 'style', 'class', 'offset'];
-
-    SvgLabel.layers = [];
-
-    kartograph.Label = SvgLabel;
-
-    HtmlLabel = (function (_super) {
-
-        __extends(HtmlLabel, _super);
-
-        function HtmlLabel(opts) {
-            var me, _ref6, _ref7, _ref8;
-            me = this;
-            HtmlLabel.__super__.constructor.call(this, opts);
-            me.text = (_ref6 = opts.text) != null ? _ref6 : '';
-            me.style = (_ref7 = opts.style) != null ? _ref7 : '';
-            me["class"] = (_ref8 = opts["class"]) != null ? _ref8 : '';
-        }
-
-        HtmlLabel.prototype.render = function (layers) {
-            var l, lbl, me;
-            me = this;
-            l = $('<div>' + me.text + '</div>');
-            l.css({
-                width: '50px',
-                position: 'absolute',
-                left: '-25px',
-                'text-align': 'center'
-            });
-            me.lbl = lbl = $('<div class="label" />');
-            lbl.append(l);
-            me.layers.lbl.append(lbl);
-            l.css({
-                height: l.height() + 'px',
-                top: (l.height() * -.4) + 'px'
-            });
-            me.update();
-            return me;
-        };
-
-        HtmlLabel.prototype.update = function () {
-            var me;
-            me = this;
-            return me.lbl.css({
-                position: 'absolute',
-                left: me.x + 'px',
-                top: me.y + 'px'
-            });
-        };
-
-        HtmlLabel.prototype.clear = function () {
-            var me;
-            me = this;
-            me.lbl.remove();
-            return me;
-        };
-
-        HtmlLabel.prototype.nodes = function () {
-            var me;
-            me = this;
-            return [me.lbl[0]];
-        };
-
-        return HtmlLabel;
-
-    })(kartograph.Symbol);
-
-    HtmlLabel.props = ['text', 'style', 'class'];
-
-    HtmlLabel.layers = [
-        {
-            id: 'lbl',
-            type: 'html'
-        }
-    ];
-
-    kartograph.HtmlLabel = HtmlLabel;
-
-    /*
-     kartograph - a svg mapping library
-     Copyright (C) 2011,2012  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    LabeledBubble = (function (_super) {
-
-        __extends(LabeledBubble, _super);
-
-        function LabeledBubble(opts) {
-            this.nodes = __bind(this.nodes, this);
-
-            this.clear = __bind(this.clear, this);
-
-            this.update = __bind(this.update, this);
-
-            this.render = __bind(this.render, this);
-
-            var me, _ref6, _ref7;
-            me = this;
-            LabeledBubble.__super__.constructor.call(this, opts);
-            me.labelattrs = (_ref6 = opts.labelattrs) != null ? _ref6 : {};
-            me.buffer = opts.buffer;
-            me.center = (_ref7 = opts.center) != null ? _ref7 : true;
-        }
-
-        LabeledBubble.prototype.render = function (layers) {
-            var me;
-            me = this;
-            if ((me.title != null) && String(me.title).trim() !== '') {
-                if (me.buffer) {
-                    me.bufferlabel = me.layers.mapcanvas.text(me.x, me.y, me.title);
-                }
-                me.label = me.layers.mapcanvas.text(me.x, me.y, me.title);
-            }
-            LabeledBubble.__super__.render.call(this, layers);
-            return me;
-        };
-
-        LabeledBubble.prototype.update = function (duration, easing) {
-            var attrs, me, vp, x, y;
-            if (duration == null) {
-                duration = false;
-            }
-            if (easing == null) {
-                easing = 'expo-out';
-            }
-            me = this;
-            LabeledBubble.__super__.update.call(this, duration, easing);
-            if (me.label != null) {
-                vp = me.map.viewport;
-                attrs = $.extend({}, me.labelattrs);
-                x = me.x;
-                y = me.y;
-                if (me.center) {
-                    y -= 0;
-                } else if (x > vp.width * 0.5) {
-                    attrs['text-anchor'] = 'end';
-                    x -= me.radius + 5;
-                } else if (x < vp.width * 0.5) {
-                    attrs['text-anchor'] = 'start';
-                    x += me.radius + 5;
-                }
-                attrs['x'] = x;
-                attrs['y'] = y;
-                if (me.buffer) {
-                    me.bufferlabel.attr(attrs);
-                    me.bufferlabel.attr({
-                        stroke: '#fff',
-                        fill: '#fff',
-                        'stroke-linejoin': 'round',
-                        'stroke-linecap': 'round',
-                        'stroke-width': 6
-                    });
-                }
-                me.label.attr(attrs);
-                me.label.toFront();
-            }
-            return me;
-        };
-
-        LabeledBubble.prototype.clear = function () {
-            var me;
-            me = this;
-            return LabeledBubble.__super__.clear.apply(this, arguments);
-        };
-
-        LabeledBubble.prototype.nodes = function () {
-            var me, nodes;
-            me = this;
-            nodes = LabeledBubble.__super__.nodes.apply(this, arguments);
-            if (me.label) {
-                nodes.push(me.label.node);
-            }
-            if (me.bufferlabel) {
-                nodes.push(me.bufferlabel.node);
-            }
-            return nodes;
-        };
-
-        return LabeledBubble;
-
-    })(Bubble);
-
-    LabeledBubble.props = ['radius', 'style', 'class', 'title', 'labelattrs', 'buffer', 'center', 'attrs'];
-
-    LabeledBubble.layers = [];
-
-    kartograph.LabeledBubble = LabeledBubble;
-
-    /*
-     kartograph - a svg mapping library
-     Copyright (C) 2011,2012  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    PieChart = (function (_super) {
-        var me;
-
-        __extends(PieChart, _super);
-
-        /*
-         usage:
-         new SymbolMap({
-         map: map,
-         radius: 10
-         data: [25,75],
-         colors: ['red', 'blue'],
-         titles: ['red pie', 'blue pie']
-         })
-         */
-
-
-        me = null;
-
-        function PieChart(opts) {
-            var _base2, _ref10, _ref11, _ref12, _ref13, _ref14, _ref6, _ref7, _ref8, _ref9;
-            me = this;
-            PieChart.__super__.constructor.call(this, opts);
-            me.radius = (_ref6 = opts.radius) != null ? _ref6 : 4;
-            me.styles = (_ref7 = opts.styles) != null ? _ref7 : '';
-            me.colors = (_ref8 = opts.colors) != null ? _ref8 : ['#3cc', '#c3c', '#33c', '#cc3'];
-            me.titles = (_ref9 = opts.titles) != null ? _ref9 : ['', '', '', '', ''];
-            me.values = (_ref10 = opts.values) != null ? _ref10 : [];
-            me.border = (_ref11 = opts.border) != null ? _ref11 : false;
-            me.borderWidth = (_ref12 = opts.borderWidth) != null ? _ref12 : 2;
-            me["class"] = (_ref13 = opts["class"]) != null ? _ref13 : 'piechart';
-            if ((_ref14 = (_base2 = Raphael.fn).pieChart) == null) {
-                _base2.pieChart = drawPieChart;
-            }
-        }
-
-        PieChart.prototype.overlaps = function (bubble) {
-            var dx, dy, r1, r2, x1, x2, y1, y2, _ref6, _ref7;
-            _ref6 = [me.x, me.y, me.radius], x1 = _ref6[0], y1 = _ref6[1], r1 = _ref6[2];
-            _ref7 = [bubble.x, bubble.y, bubble.radius], x2 = _ref7[0], y2 = _ref7[1], r2 = _ref7[2];
-            if (x1 - r1 > x2 + r2 || x1 + r1 < x2 - r2 || y1 - r1 > y2 + r2 || y1 + r1 < y2 - r2) {
-                return false;
-            }
-            dx = x1 - x2;
-            dy = y1 - y2;
-            if (dx * dx + dy * dy > (r1 + r2) * (r1 + r2)) {
-                return false;
-            }
-            return true;
-        };
-
-        PieChart.prototype.render = function (layers) {
-            var bg;
-            me = this;
-            if (me.border != null) {
-                bg = me.layers.mapcanvas.circle(me.x, me.y, me.radius + me.borderWidth).attr({
-                    stroke: 'none',
-                    fill: me.border
-                });
-            }
-            me.chart = me.layers.mapcanvas.pieChart(me.x, me.y, me.radius, me.values, me.titles, me.colors, "none");
-            me.chart.push(bg);
-            return me;
-        };
-
-        PieChart.prototype.update = function (opts) {
-            var path;
-            return;
-            me.path.attr({
-                x: me.x,
-                y: me.y,
-                r: me.radius
-            });
-            path = me.path;
-            path.node.setAttribute('style', me.styles[0]);
-            path.node.setAttribute('class', me["class"]);
-            if (me.title != null) {
-                path.attr('title', me.titles[0]);
-            }
-            return me;
-        };
-
-        PieChart.prototype.clear = function () {
-            var p, _i, _len, _ref6;
-            me = this;
-            _ref6 = me.chart;
-            for (_i = 0, _len = _ref6.length; _i < _len; _i++) {
-                p = _ref6[_i];
-                p.remove();
-            }
-            return me;
-        };
-
-        PieChart.prototype.nodes = function () {
-            var el, _i, _len, _ref6, _results;
-            _ref6 = me.chart;
-            _results = [];
-            for (_i = 0, _len = _ref6.length; _i < _len; _i++) {
-                el = _ref6[_i];
-                _results.push(el.node);
-            }
-            return _results;
-        };
-
-        return PieChart;
-
-    })(Symbol);
-
-    PieChart.props = ['radius', 'values', 'styles', 'class', 'titles', 'colors', 'border', 'borderWidth'];
-
-    PieChart.layers = [];
-
-    kartograph.PieChart = PieChart;
-
-    /*
-     pie chart extension for RaphaelJS
-     */
-
-
-    drawPieChart = function (cx, cy, r, values, labels, colors, stroke) {
-        var angle, chart, i, paper, process, rad, sector, total, v, _i, _len;
-        if (isNaN(cx) || isNaN(cy) || isNaN(r)) {
-            return [];
-        }
-        paper = this;
-        rad = Math.PI / 180;
-        chart = paper.set();
-        sector = function (cx, cy, r, startAngle, endAngle, params) {
-            var x1, x2, y1, y2;
-            x1 = cx + r * Math.cos(-startAngle * rad);
-            x2 = cx + r * Math.cos(-endAngle * rad);
-            y1 = cy + r * Math.sin(-startAngle * rad);
-            y2 = cy + r * Math.sin(-endAngle * rad);
-            return paper.path(["M", cx, cy, "L", x1, y1, "A", r, r, 0, +(endAngle - startAngle > 180), 0, x2, y2, "z"]).attr(params);
-        };
-        angle = -270;
-        total = 0;
-        process = function (j) {
-            var angleplus, color, delta, ms, p, popangle, value;
-            value = values[j];
-            angleplus = 360 * value / total;
-            popangle = angle + (angleplus * 0.5);
-            color = colors[j];
-            ms = 500;
-            delta = 30;
-            p = sector(cx, cy, r, angle, angle + angleplus, {
-                fill: color,
-                stroke: stroke,
-                'stroke-width': 1
-            });
-            p.mouseover(function () {
-                p.stop().animate({
-                    transform: "s1.1 1.1 " + cx + " " + cy
-                }, ms, "elastic");
-            });
-            p.mouseout(function () {
-                p.stop().animate({
-                    transform: ""
-                }, ms, "elastic");
-            });
-            angle += angleplus;
-            chart.push(p);
-        };
-        for (_i = 0, _len = values.length; _i < _len; _i++) {
-            v = values[_i];
-            total += v;
-        }
-        for (i in values) {
-            process(i);
-        }
-        return chart;
-    };
-
-    /*
-     kartograph - a svg mapping library 
-     Copyright (C) 2011,2012  Gregor Aisch
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library. If not, see <http://www.gnu.org/licenses/>.
-     */
-
-
-    drawStackedBars = function (cx, cy, w, h, values, labels, colors, stroke) {
-        var paper = this,
-            chart = this.set();
-
-        function bar(x, y, w, h, params) {
-            return paper.rect(x, y, w, h).attr(params);
-        }
-
-        var yo = 0,
-            total = 0,
-            process = function (j) {
-                var value = values[j],
-                    bh = h * value / total,
-                    x = cx - w * 0.5,
-                    y = cy + h * 0.5 - yo,
-                    bw = w,
-                    color = colors[j],
-                    ms = 500,
-                    delta = 30,
-                    p = bar(x, y - bh, bw, bh, {fill: color, stroke: stroke, "stroke-width": 1});
-
-                yo += bh;
-
-                p.mouseover(function () {
-                    p.stop().animate({transform: "s1.1 1.1 " + cx + " " + cy}, ms, "elastic");
-                }).mouseout(function () {
-                        p.stop().animate({transform: ""}, ms, "elastic");
-
-                    });
-                chart.push(p);
-            };
-        for (var i = 0, ii = values.length; i < ii; i++) {
-            total += values[i];
-        }
-        for (i = 0; i < ii; i++) {
-            process(i);
-        }
-        return chart;
-    };
-
-    ;
-
-
-    StackedBarChart = (function (_super) {
-
-        __extends(StackedBarChart, _super);
-
-        /*
-         usage:
-         new SymbolMap({
-         map: map,
-         radius: 10
-         data: [25,75],
-         colors: ['red', 'blue'],
-         titles: ['red pie', 'blue pie']
-         })
-         */
-
-
-        function StackedBarChart(opts) {
-            var me, _base2, _ref10, _ref11, _ref12, _ref13, _ref6, _ref7, _ref8, _ref9;
-            me = this;
-            StackedBarChart.__super__.constructor.call(this, opts);
-            me.styles = (_ref6 = opts.styles) != null ? _ref6 : '';
-            me.colors = (_ref7 = opts.colors) != null ? _ref7 : [];
-            me.titles = (_ref8 = opts.titles) != null ? _ref8 : ['', '', '', '', ''];
-            me.values = (_ref9 = opts.values) != null ? _ref9 : [];
-            me.width = (_ref10 = opts.width) != null ? _ref10 : 17;
-            me.height = (_ref11 = opts.height) != null ? _ref11 : 30;
-            me["class"] = (_ref12 = opts["class"]) != null ? _ref12 : 'barchart';
-            if ((_ref13 = (_base2 = Raphael.fn).drawStackedBarChart) == null) {
-                _base2.drawStackedBarChart = drawStackedBars;
-            }
-        }
-
-        StackedBarChart.prototype.overlaps = function (bubble) {
-            var dx, dy, me, r1, r2, x1, x2, y1, y2, _ref6, _ref7;
-            me = this;
-            _ref6 = [me.x, me.y, me.radius], x1 = _ref6[0], y1 = _ref6[1], r1 = _ref6[2];
-            _ref7 = [bubble.x, bubble.y, bubble.radius], x2 = _ref7[0], y2 = _ref7[1], r2 = _ref7[2];
-            if (x1 - r1 > x2 + r2 || x1 + r1 < x2 - r2 || y1 - r1 > y2 + r2 || y1 + r1 < y2 - r2) {
-                return false;
-            }
-            dx = x1 - x2;
-            dy = y1 - y2;
-            if (dx * dx + dy * dy > (r1 + r2) * (r1 + r2)) {
-                return false;
-            }
-            return true;
-        };
-
-        StackedBarChart.prototype.render = function (layers) {
-            var bg, h, me, w, x, y;
-            me = this;
-            w = me.width;
-            h = me.height;
-            x = me.x;
-            y = me.y;
-            bg = me.layers.mapcanvas.rect(x - w * 0.5 - 2, y - h * 0.5 - 2, w + 4, h + 4).attr({
-                stroke: 'none',
-                fill: '#fff'
-            });
-            me.chart = me.layers.mapcanvas.drawStackedBarChart(me.x, me.y, me.width, me.height, me.values, me.titles, me.colors, "none");
-            me.chart.push(bg);
-            return me;
-        };
-
-        StackedBarChart.prototype.update = function () {
-            var me, path;
-            me = this;
-            return;
-            me.path.attr({
-                x: me.x,
-                y: me.y,
-                r: me.radius
-            });
-            path = me.path;
-            path.node.setAttribute('style', me.styles[0]);
-            path.node.setAttribute('class', me["class"]);
-            if (me.title != null) {
-                path.attr('title', me.titles[0]);
-            }
-            return me;
-        };
-
-        StackedBarChart.prototype.clear = function () {
-            var me, p, _i, _len, _ref6;
-            me = this;
-            _ref6 = me.chart;
-            for (_i = 0, _len = _ref6.length; _i < _len; _i++) {
-                p = _ref6[_i];
-                p.remove();
-            }
-            me.chart = [];
-            return me;
-        };
-
-        StackedBarChart.prototype.nodes = function () {
-            var el, me, _i, _len, _ref6, _results;
-            me = this;
-            _ref6 = me.chart;
-            _results = [];
-            for (_i = 0, _len = _ref6.length; _i < _len; _i++) {
-                el = _ref6[_i];
-                _results.push(el.node);
-            }
-            return _results;
-        };
-
-        return StackedBarChart;
-
-    })(kartograph.Symbol);
-
-    StackedBarChart.props = ['values', 'styles', 'class', 'titles', 'colors', 'width', 'height'];
-
-    StackedBarChart.layers = [];
-
-    kartograph.StackedBarChart = StackedBarChart;
-
-}).call(this);
diff --git a/plugins/UserCountryMap/javascripts/vendor/kmeans.js b/plugins/UserCountryMap/javascripts/vendor/kmeans.js
deleted file mode 100644
index f4a0d9ca4c..0000000000
--- a/plugins/UserCountryMap/javascripts/vendor/kmeans.js
+++ /dev/null
@@ -1,145 +0,0 @@
-// k-means clustering
-function kmeans() {
-    var kmeans = {},
-        points = [],
-        iterations = 1,
-        size = 1;
-
-    kmeans.size = function (x) {
-        if (!arguments.length) return size;
-        size = x;
-        return kmeans;
-    };
-
-    kmeans.iterations = function (x) {
-        if (!arguments.length) return iterations;
-        iterations = x;
-        return kmeans;
-    };
-
-    kmeans.add = function (x) {
-        points.push(x);
-        return kmeans;
-    };
-
-    kmeans.means = function () {
-        var means = [],
-            seen = {},
-            n = Math.min(size, points.length);
-
-        // Initialize k random (unique!) means.
-        for (var i = 0, m = 2 * n; i < m; i++) {
-            var p = points[~~(Math.random() * points.length)], id = p.x + "/" + p.y;
-            if (!(id in seen)) {
-                seen[id] = 1;
-                if (means.push({x: p.x, y: p.y}) >= n) break;
-            }
-        }
-        n = means.length;
-
-        // For each iteration, create a kd-tree of the current means.
-        for (var j = 0; j < iterations; j++) {
-            var kd = kdtree().points(means);
-
-            // Clear the state.
-            for (var i = 0; i < n; i++) {
-                var mean = means[i];
-                mean.sumX = 0;
-                mean.sumY = 0;
-                mean.size = 0;
-                mean.points = [];
-            }
-
-            // Find the mean closest to each point.
-            for (var i = 0; i < points.length; i++) {
-                var point = points[i], mean = kd.find(point);
-                mean.sumX += point.x;
-                mean.sumY += point.y;
-                mean.size++;
-                mean.points.push(point);
-            }
-
-            // Compute the new means.
-            for (var i = 0; i < n; i++) {
-                var mean = means[i];
-                if (!mean.size) continue; // overlapping mean
-                mean.x = mean.sumX / mean.size;
-                mean.y = mean.sumY / mean.size;
-            }
-        }
-
-        return means;
-    };
-
-    return kmeans;
-}
-
-// kd-tree
-function kdtree() {
-    var kdtree = {},
-        axes = ["x", "y"],
-        root,
-        points = [];
-
-    kdtree.axes = function (x) {
-        if (!arguments.length) return axes;
-        axes = x;
-        return kdtree;
-    };
-
-    kdtree.points = function (x) {
-        if (!arguments.length) return points;
-        points = x;
-        root = null;
-        return kdtree;
-    };
-
-    kdtree.find = function (x) {
-        return find(kdtree.root(), x, root).point;
-    };
-
-    kdtree.root = function (x) {
-        return root || (root = node(points, 0));
-    };
-
-    function node(points, depth) {
-        if (!points.length) return;
-        var axis = axes[depth % axes.length], median = points.length >> 1;
-        points.sort(order(axis)); // could use random sample to speed up here
-        return {
-            axis: axis,
-            point: points[median],
-            left: node(points.slice(0, median), depth + 1),
-            right: node(points.slice(median + 1), depth + 1)
-        };
-    }
-
-    function distance(a, b) {
-        var sum = 0;
-        for (var i = 0; i < axes.length; i++) {
-            var axis = axes[i], d = a[axis] - b[axis];
-            sum += d * d;
-        }
-        return sum;
-    }
-
-    function order(axis) {
-        return function (a, b) {
-            a = a[axis];
-            b = b[axis];
-            return a < b ? -1 : a > b ? 1 : 0;
-        };
-    }
-
-    function find(node, point, best) {
-        if (distance(node.point, point) < distance(best.point, point)) best = node;
-        if (node.left) best = find(node.left, point, best);
-        if (node.right) {
-            var d = node.point[node.axis] - point[node.axis];
-            if (d * d < distance(best.point, point)) best = find(node.right, point, best);
-        }
-        return best;
-    }
-
-    return kdtree;
-}
diff --git a/plugins/UserCountryMap/templates/realtime-map.twig b/plugins/UserCountryMap/templates/realtimeMap.twig
index 17933eca58..17933eca58 100644
--- a/plugins/UserCountryMap/templates/realtime-map.twig
+++ b/plugins/UserCountryMap/templates/realtimeMap.twig
diff --git a/plugins/UserCountryMap/templates/visitor-map.twig b/plugins/UserCountryMap/templates/visitorMap.twig
index 0a95b574bd..0a95b574bd 100644
--- a/plugins/UserCountryMap/templates/visitor-map.twig
+++ b/plugins/UserCountryMap/templates/visitorMap.twig
diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
index 730e756c27..adef52eaaa 100644
--- a/plugins/UsersManager/Controller.php
+++ b/plugins/UsersManager/Controller.php
@@ -27,7 +27,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin
     {
         Piwik::checkUserIsNotAnonymous();
 
-        $view = new Piwik_View('@UsersManager/UsersManager');
+        $view = new Piwik_View('@UsersManager/index');
 
         $IdSitesAdmin = Piwik_SitesManager_API::getInstance()->getSitesIdWithAdminAccess();
         $idSiteSelected = 1;
diff --git a/plugins/UsersManager/templates/UsersManager.twig b/plugins/UsersManager/templates/index.twig
index 883952079d..d2ad1d02e1 100644
--- a/plugins/UsersManager/templates/UsersManager.twig
+++ b/plugins/UsersManager/templates/index.twig
@@ -42,7 +42,7 @@
         {% set applyAllSitesText %}
             <strong>{{ 'UsersManager_ApplyToAllWebsites'|translate }}</strong>
         {% endset %}
-        {% include "@CoreHome/sites_selection.twig" with {
+        {% include "@CoreHome/_siteSelect.twig" with {
             'siteName': defaultReportSiteName,
             'idSite':idSiteSelected,
             'allSitesItemText': applyAllSitesText,
diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig
index fb94dfb538..d52c2ea6eb 100644
--- a/plugins/UsersManager/templates/userSettings.twig
+++ b/plugins/UsersManager/templates/userSettings.twig
@@ -49,7 +49,7 @@
                 {% else %}
                     {% set defaultReportIdSite=defaultReport %}
                 {% endif %}
-                {% include "@CoreHome/sites_selection.twig" with {
+                {% include "@CoreHome/_siteSelect.twig" with {
                     'siteName':defaultReportSiteName,
                     'idSite':defaultReportIdSite,
                     'switchSiteOnSelect':false,
diff --git a/plugins/VisitFrequency/Controller.php b/plugins/VisitFrequency/Controller.php
index 45254b67fe..982756148e 100644
--- a/plugins/VisitFrequency/Controller.php
+++ b/plugins/VisitFrequency/Controller.php
@@ -25,7 +25,7 @@ class Piwik_VisitFrequency_Controller extends Piwik_Controller
 
     public function getSparklines()
     {
-        $view = new Piwik_View('@VisitFrequency/sparklines');
+        $view = new Piwik_View('@VisitFrequency/getSparklines');
         $this->setSparklinesAndNumbers($view);
         echo $view->render();
     }
diff --git a/plugins/VisitFrequency/templates/sparklines.twig b/plugins/VisitFrequency/templates/_sparklines.twig
index 085a44c170..75f21e669e 100644
--- a/plugins/VisitFrequency/templates/sparklines.twig
+++ b/plugins/VisitFrequency/templates/_sparklines.twig
@@ -19,4 +19,4 @@
     {{ sparkline(urlSparklineBounceRateReturning) }}
     {{ 'VisitFrequency_ReturnBounceRate'|translate("<strong>"+bounceRateReturning+"%</strong>")|raw }}
 </div>
-{% include "@CoreHome/sparkline_footer.twig" %}
+{% include "_sparklineFooter.twig" %}
diff --git a/plugins/VisitFrequency/templates/getSparklines.twig b/plugins/VisitFrequency/templates/getSparklines.twig
new file mode 100644
index 0000000000..fd158c8329
--- /dev/null
+++ b/plugins/VisitFrequency/templates/getSparklines.twig
@@ -0,0 +1 @@
+{% include "@VisitFrequency/_sparklines.twig" %}
\ No newline at end of file
diff --git a/plugins/VisitFrequency/templates/index.twig b/plugins/VisitFrequency/templates/index.twig
index 237f922c20..82053d00f6 100644
--- a/plugins/VisitFrequency/templates/index.twig
+++ b/plugins/VisitFrequency/templates/index.twig
@@ -5,6 +5,6 @@
 {{ graphEvolutionVisitFrequency|raw }}
 <br/>
 
-{% include "@VisitFrequency/sparklines.twig" %}
+{% include "@VisitFrequency/_sparklines.twig" %}
 
 {{ postEvent("template_footerVisitsFrequency") }}
diff --git a/plugins/VisitorGenerator/templates/index.twig b/plugins/VisitorGenerator/templates/index.twig
index 2a453479ce..85b3006287 100644
--- a/plugins/VisitorGenerator/templates/index.twig
+++ b/plugins/VisitorGenerator/templates/index.twig
@@ -10,7 +10,7 @@
         <tr>
             <td><label for="idSite">{{ 'General_ChooseWebsite'|translate }}</label></td>
             <td>
-                {% include "@CoreHome/sites_selection.twig" with {
+                {% include "@CoreHome/_siteSelect.twig" with {
                 'showAllSitesItem':false,'showSelectedSite':true,'switchSiteOnSelect':false,'inputName':idSite } %}
             </td>
         </tr>
diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php
index 8eaa3f21e3..da846c23ed 100644
--- a/plugins/VisitsSummary/Controller.php
+++ b/plugins/VisitsSummary/Controller.php
@@ -26,7 +26,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller
 
     public function getSparklines()
     {
-        $view = new Piwik_View('@VisitsSummary/sparklines');
+        $view = new Piwik_View('@VisitsSummary/getSparklines');
         $this->setPeriodVariablesView($view);
         $this->setSparklinesAndNumbers($view);
         echo $view->render();
diff --git a/plugins/VisitsSummary/templates/sparklines.twig b/plugins/VisitsSummary/templates/_sparklines.twig
index ca405b5799..c3a22290b0 100644
--- a/plugins/VisitsSummary/templates/sparklines.twig
+++ b/plugins/VisitsSummary/templates/_sparklines.twig
@@ -61,5 +61,5 @@
 </div>
 <div style="clear:both;"></div>
 
-{% include "@CoreHome/sparkline_footer.twig" %}
+{% include "_sparklineFooter.twig" %}
 
diff --git a/plugins/VisitsSummary/templates/getSparklines.twig b/plugins/VisitsSummary/templates/getSparklines.twig
new file mode 100644
index 0000000000..7e35981828
--- /dev/null
+++ b/plugins/VisitsSummary/templates/getSparklines.twig
@@ -0,0 +1 @@
+{% include "@VisitsSummary/_sparklines.twig" %}
\ No newline at end of file
diff --git a/plugins/VisitsSummary/templates/index.twig b/plugins/VisitsSummary/templates/index.twig
index 1dd7a49689..6769b9e876 100644
--- a/plugins/VisitsSummary/templates/index.twig
+++ b/plugins/VisitsSummary/templates/index.twig
@@ -6,7 +6,7 @@
 {{ graphEvolutionVisitsSummary|raw }}
 
 <h2>{{ 'General_Report'|translate }}</h2>
-{% include "@VisitsSummary/sparklines.twig" %}
+{% include "@VisitsSummary/_sparklines.twig" %}
 {#
 Time page generation
 	<p style='color:lightgrey; size:0.8em;'>
diff --git a/plugins/Widgetize/Controller.php b/plugins/Widgetize/Controller.php
index e478d992c8..1f326563b8 100644
--- a/plugins/Widgetize/Controller.php
+++ b/plugins/Widgetize/Controller.php
@@ -25,7 +25,7 @@ class Piwik_Widgetize_Controller extends Piwik_Controller
 
     public function testJsInclude1()
     {
-        $view = new Piwik_View('@Widgetize/test_jsinclude');
+        $view = new Piwik_View('@Widgetize/testJsInclude1');
         $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=UserSettings&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday';
         $view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=API&actionToWidgetize=index&method=ExamplePlugin.getGoldenRatio&format=original';
         echo $view->render();
@@ -33,7 +33,7 @@ class Piwik_Widgetize_Controller extends Piwik_Controller
 
     public function testJsInclude2()
     {
-        $view = new Piwik_View('@Widgetize/test_jsinclude2');
+        $view = new Piwik_View('@Widgetize/testJsInclude2');
         $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=UserSettings&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday';
         $view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=UserCountry&actionToWidgetize=getCountry&idSite=1&period=day&date=yesterday&viewDataTable=cloud&show_footer=0';
         $view->url3 = '?module=Widgetize&action=js&moduleToWidgetize=Referers&actionToWidgetize=getKeywords&idSite=1&period=day&date=yesterday&viewDataTable=table&show_footer=0';
@@ -49,7 +49,7 @@ class Piwik_Widgetize_Controller extends Piwik_Controller
         $parameters = array($fetch = true);
         $outputDataTable = Piwik_FrontController::getInstance()->fetchDispatch($controllerName, $actionName, $parameters);
         if ($controllerName == 'Dashboard' && $actionName == 'index') {
-            $view = new Piwik_View('@Widgetize/empty');
+            $view = new Piwik_View('@Widgetize/iframe_empty');
         } else {
             $view = new Piwik_View('@Widgetize/iframe');
         }
diff --git a/plugins/Widgetize/templates/iframe.twig b/plugins/Widgetize/templates/iframe.twig
index 5413450d9c..ea34ef8936 100644
--- a/plugins/Widgetize/templates/iframe.twig
+++ b/plugins/Widgetize/templates/iframe.twig
@@ -4,11 +4,11 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
         {{ loadJavascriptTranslations(['CoreHome']) }}
-        {% include "@CoreHome/js_global_variables.twig" %}
+        {% include "_jsGlobalVariables.twig" %}
         <!--[if lt IE 9]>
         <script language="javascript" type="text/javascript" src="libs/jqplot/excanvas.min.js"></script>
         <![endif]-->
-        {% include "@CoreHome/js_css_includes.twig" %}
+        {% include "_jsCssIncludes.twig" %}
         <!--[if IE]>
         <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/ieonly.css"/>
         <![endif]-->
diff --git a/plugins/Widgetize/templates/empty.twig b/plugins/Widgetize/templates/iframe_empty.twig
index b40340ba39..b40340ba39 100644
--- a/plugins/Widgetize/templates/empty.twig
+++ b/plugins/Widgetize/templates/iframe_empty.twig
diff --git a/plugins/Widgetize/templates/index.twig b/plugins/Widgetize/templates/index.twig
index a47327f1e8..4f78ad5ebb 100644
--- a/plugins/Widgetize/templates/index.twig
+++ b/plugins/Widgetize/templates/index.twig
@@ -75,7 +75,7 @@
 </script>
 
 <div class="top_controls_inner">
-    {% include "@CoreHome/period_select.twig" %}
+    {% include "@CoreHome/_periodSelect.twig" %}
 </div>
 
 <div class="widgetize">
diff --git a/plugins/Widgetize/templates/test_jsinclude.twig b/plugins/Widgetize/templates/testJsInclude1.twig
index 95c4a3945c..95c4a3945c 100644
--- a/plugins/Widgetize/templates/test_jsinclude.twig
+++ b/plugins/Widgetize/templates/testJsInclude1.twig
diff --git a/plugins/Widgetize/templates/test_jsinclude2.twig b/plugins/Widgetize/templates/testJsInclude2.twig
index 92dba2b47b..92dba2b47b 100644
--- a/plugins/Widgetize/templates/test_jsinclude2.twig
+++ b/plugins/Widgetize/templates/testJsInclude2.twig
diff --git a/plugins/CoreHome/templates/iframe_buster_body.twig b/plugins/Zeitgeist/templates/_iframeBusterBody.twig
index 8322f4e483..8322f4e483 100644
--- a/plugins/CoreHome/templates/iframe_buster_body.twig
+++ b/plugins/Zeitgeist/templates/_iframeBusterBody.twig
diff --git a/plugins/CoreHome/templates/iframe_buster_header.twig b/plugins/Zeitgeist/templates/_iframeBusterHeader.twig
index b3c070d91c..b3c070d91c 100644
--- a/plugins/CoreHome/templates/iframe_buster_header.twig
+++ b/plugins/Zeitgeist/templates/_iframeBusterHeader.twig
diff --git a/plugins/CoreHome/templates/index_before_menu.twig b/plugins/Zeitgeist/templates/_indexBeforeMenu.twig
index 70c2854b61..6293d6f930 100644
--- a/plugins/CoreHome/templates/index_before_menu.twig
+++ b/plugins/Zeitgeist/templates/_indexBeforeMenu.twig
@@ -1,9 +1,9 @@
-{% include "@CoreHome/warning_invalid_host.twig" %}
+{% include "@CoreHome/_warningInvalidHost.twig" %}
 
 {% if (showTopMenu == false or showTopMenu) %}
-    {% include "@CoreHome/top_bar.twig" %}
+    {% include "@CoreHome/_topBar.twig" %}
 {% endif %}
-{% include "@CoreHome/top_screen.twig" %}
+{% include "@CoreHome/_topScreen.twig" %}
 
 <div class="ui-confirm" id="alert">
     <h2></h2>
diff --git a/plugins/CoreHome/templates/js_css_includes.twig b/plugins/Zeitgeist/templates/_jsCssIncludes.twig
index eb9a3cdbb1..eb9a3cdbb1 100644
--- a/plugins/CoreHome/templates/js_css_includes.twig
+++ b/plugins/Zeitgeist/templates/_jsCssIncludes.twig
diff --git a/plugins/CoreHome/templates/js_global_variables.twig b/plugins/Zeitgeist/templates/_jsGlobalVariables.twig
index d00ea372e5..d00ea372e5 100644
--- a/plugins/CoreHome/templates/js_global_variables.twig
+++ b/plugins/Zeitgeist/templates/_jsGlobalVariables.twig
diff --git a/plugins/CoreHome/templates/piwik_tag.twig b/plugins/Zeitgeist/templates/_piwikTag.twig
index ec37b774f9..ec37b774f9 100644
--- a/plugins/CoreHome/templates/piwik_tag.twig
+++ b/plugins/Zeitgeist/templates/_piwikTag.twig
diff --git a/plugins/CoreHome/templates/sparkline_footer.twig b/plugins/Zeitgeist/templates/_sparklineFooter.twig
index b8b864d75c..b8b864d75c 100644
--- a/plugins/CoreHome/templates/sparkline_footer.twig
+++ b/plugins/Zeitgeist/templates/_sparklineFooter.twig
diff --git a/plugins/Zeitgeist/templates/admin.twig b/plugins/Zeitgeist/templates/admin.twig
index de3969a148..a5746c5847 100644
--- a/plugins/Zeitgeist/templates/admin.twig
+++ b/plugins/Zeitgeist/templates/admin.twig
@@ -12,40 +12,40 @@
 
             {{ loadJavascriptTranslations(['CoreAdminHome','CoreHome'])|raw }}
 
-            {% include "@CoreHome/js_global_variables.twig" %}
-            {% include "@CoreHome/js_css_includes.twig" %}
+            {% include "_jsGlobalVariables.twig" %}
+            {% include "_jsCssIncludes.twig" %}
             <!--[if IE]>
             <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/ieonly.css"/>
             <![endif]-->
-            {% include "@CoreHome/iframe_buster_header.twig" %}
+            {% include "_iframeBusterHeader.twig" %}
         {% endblock %}
     </head>
     <body>
-    {% include "@CoreHome/iframe_buster_body.twig" %}
+    {% include "_iframeBusterBody.twig" %}
 
         <div id="root">
             {% if showTopMenu is not defined or showTopMenu %}
                 {% set showSitesSelection = false %}
                 {% set showPeriodSelection = false %}
-                {% include "@CoreHome/top_bar.twig" %}
+                {% include "@CoreHome/_topBar.twig" %}
             {% endif %}
 
             <div id="header">
-                {% include "@CoreHome/logo.twig" %}
-                {% if showPeriodSelection %}{% include "@CoreHome/period_select.twig"%}{% endif %}
-                {% include "@CoreHome/js_disabled_notice.twig" %}
+                {% include "@CoreHome/_logo.twig" %}
+                {% if showPeriodSelection %}{% include "@CoreHome/_periodSelect.twig"%}{% endif %}
+                {% include "@CoreHome/_javaScriptDisabled.twig" %}
             </div>
 
             {% import 'ajaxMacros.twig' as ajax %}
             {{ ajax.requestErrorDiv }}
             <div id="container">
                 {% if showMenu is not defined or showMenu %}
-                    {% include "@CoreAdminHome/menu.twig" %}
+                    {% include "@CoreAdminHome/_menu.twig" %}
                 {% endif %}
 
                 <div id="content" class="admin">
 
-                    {% include "@CoreHome/header_message.twig" %}
+                    {% include "@CoreHome/_headerMessage.twig" %}
 
                     {% if configFileNotWritable is not empty %}
                     <div class="ajaxSuccess" style="display:inline-block">
@@ -68,7 +68,7 @@
                         <input role="no" type="button" value="{{ 'General_Ok'|translate }}"/>
                     </div>
 
-                    {% include "@CoreHome/warning_invalid_host.twig" %}
+                    {% include "@CoreHome/_warningInvalidHost.twig" %}
 
                     {# missing plugins warning #}
                     {% if isSuperUser and missingPluginsWarning is not empty %}
@@ -90,7 +90,7 @@
 
                 </div>
             </div>
-            {% include "@CoreHome/piwik_tag.twig" %}
+            {% include "_piwikTag.twig" %}
         </div>
     </body>
 </html>
diff --git a/plugins/Zeitgeist/templates/dashboard.twig b/plugins/Zeitgeist/templates/dashboard.twig
index f476227885..fb6c675dbb 100644
--- a/plugins/Zeitgeist/templates/dashboard.twig
+++ b/plugins/Zeitgeist/templates/dashboard.twig
@@ -11,28 +11,28 @@
             <meta name="description" content="Web Analytics report for '{{ siteName }}' - Piwik"/>
             <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
             {{ loadJavascriptTranslations(['CoreHome','Annotations'])|raw }}
-            {% include "@CoreHome/js_global_variables.twig" %}
+            {% include "_jsGlobalVariables.twig" %}
             <!--[if lt IE 9]>
             <script language="javascript" type="text/javascript" src="libs/jqplot/excanvas.min.js"></script>
             <![endif]-->
-            {% include "@CoreHome/js_css_includes.twig" %}
+            {% include "_jsCssIncludes.twig" %}
             <!--[if IE]>
             <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/ieonly.css"/>
             <![endif]-->
-            {% include "@CoreHome/iframe_buster_header.twig" %}
+            {% include "_iframeBusterHeader.twig" %}
         {% endblock %}
     </head>
     <body>
-    {% include "@CoreHome/iframe_buster_body.twig" %}
+    {% include "_iframeBusterBody.twig" %}
 
     <div id="root">
-        {% include "@CoreHome/index_before_menu.twig" %}
+        {% include "_indexBeforeMenu.twig" %}
 
         {% block content %}
         {% endblock %}
     </div>
 
-    {% include "@CoreHome/piwik_tag.twig" %}
+    {% include "_piwikTag.twig" %}
 
     </body>
 </html>
diff --git a/plugins/Zeitgeist/templates/simple_structure_footer.tpl b/plugins/Zeitgeist/templates/simpleLayoutFooter.tpl
index 9943ff0f85..9943ff0f85 100644
--- a/plugins/Zeitgeist/templates/simple_structure_footer.tpl
+++ b/plugins/Zeitgeist/templates/simpleLayoutFooter.tpl
diff --git a/plugins/Zeitgeist/templates/simple_structure_header.tpl b/plugins/Zeitgeist/templates/simpleLayoutHeader.tpl
index 364ab16fb3..364ab16fb3 100644
--- a/plugins/Zeitgeist/templates/simple_structure_header.tpl
+++ b/plugins/Zeitgeist/templates/simpleLayoutHeader.tpl
diff --git a/tests/PHPUnit/Core/AssetManagerTest.php b/tests/PHPUnit/Core/AssetManagerTest.php
index 826894fa3f..24cd73244b 100644
--- a/tests/PHPUnit/Core/AssetManagerTest.php
+++ b/tests/PHPUnit/Core/AssetManagerTest.php
@@ -14,8 +14,6 @@ class AssetManagerTest extends PHPUnit_Framework_TestCase
     public function testPrioritySort()
     {
         $buckets = array(
-            'themes/base.css',
-            'themes/',
             'libs/base.css',
             'libs/',
             'plugins/',
@@ -24,18 +22,14 @@ class AssetManagerTest extends PHPUnit_Framework_TestCase
         $data = array(
             'plugins/xyz',
             'plugins/abc',
-            'themes/base.css',
             'libs/xyz',
             'libs/base.css',
             'libs/abc',
             'plugins/xyz',
-            'themes/test',
             'libs/xyz',
         );
 
         $expected = array(
-            'themes/base.css',
-            'themes/test',
             'libs/base.css',
             'libs/xyz',
             'libs/abc',
diff --git a/tests/webtest/testcases/modules/macros.xml b/tests/webtest/testcases/modules/macros.xml
index 9236d7825b..ceeef91101 100644
--- a/tests/webtest/testcases/modules/macros.xml
+++ b/tests/webtest/testcases/modules/macros.xml
@@ -53,7 +53,6 @@
 			<fileset dir="${basedir}/../.." includes="libs/**" />
 			<fileset dir="${basedir}/../.." includes="misc/**" />
 			<fileset dir="${basedir}/../.." includes="plugins/**" />
-			<fileset dir="${basedir}/../.." includes="themes/**" />
 			<fileset dir="${basedir}/../.." includes="tmp/**" />
 			<fileset dir="${basedir}/../..">
 				<include name="*" />