diff --git a/creativecommons.class.php b/creativecommons.class.php
index 922a8a3..9f323ca 100644
--- a/creativecommons.class.php
+++ b/creativecommons.class.php
@@ -407,14 +407,19 @@ class creativecommons_license {
 
     // Main
     $dcmi_types = creativecommons_get_dcmi_types();
+    $dc_type_uri = check_plain('http://purl.org/dc/dcmitype/'. ($this->metadata['type'] && creativecommons_metadata_is_available('type') ? $this->metadata['type'] : ''));
+    $dc_type_name = check_plain($this->metadata['type'] && creativecommons_metadata_is_available('type') ? drupal_strtolower($dcmi_types[$this->metadata['type']]) : t('Work'));
+    $dc_title = check_plain($this->metadata['title'] && creativecommons_metadata_is_available('title') ? $this->metadata['title'] : $default_title);
+    $cc_attribution_url = check_plain($this->metadata['attributionURL'] && creativecommons_metadata_is_available('attributionURL') ? $this->metadata['attributionURL'] : $default_attributionURL);
+    $cc_attribution_name = check_plain($this->metadata['attributionName'] && creativecommons_metadata_is_available('attributionName') ? $this->metadata['attributionName'] : $default_name);
     $args = array(
       '@license-name' => $this->get_name(variable_get('creativecommons_text_style', 'full')),
       '@license-uri' => $this->uri,
-      '@dc:type-uri' => 'http://purl.org/dc/dcmitype/'. ($this->metadata['type'] && creativecommons_metadata_is_available('type') ? $this->metadata['type'] : ''),
-      '@dc:type-name' => $this->metadata['type'] && creativecommons_metadata_is_available('type') ? drupal_strtolower($dcmi_types[$this->metadata['type']]) : t('Work'),
-      '@dc:title' => $this->metadata['title'] && creativecommons_metadata_is_available('title') ? $this->metadata['title'] : $default_title,
-      '@cc:attributionName' => $this->metadata['attributionName'] && creativecommons_metadata_is_available('attributionName') ? $this->metadata['attributionName'] : $default_name,
-      '@cc:attributionURL' => $this->metadata['attributionURL'] && creativecommons_metadata_is_available('attributionURL') ? $this->metadata['attributionURL'] : $default_attributionURL,
+      '!type-span' => '<span rel="dc:type" href="' . $dc_type_uri . '">' . $dc_type_name . '</span>',
+      '!title-link' => '<a rel="cc:attributionURL" href="'. $cc_attribution_url . '" property="dc:title"><em>' . $dc_title . '</em></a>',
+      '!title-span' => '<span property="dc:title"><em>' . $dc_title . '</em></span>',
+      '!name-link' => '<a rel="cc:attributionURL" href="'. $cc_attribution_url . '" property="cc:attributionName"><em>'. $cc_attribution_name . '</em></a>',
+      '!name' => '<em>' . $cc_attribution_name . '</em>',
     );
 
     // All rights reserved
@@ -427,34 +432,34 @@ class creativecommons_license {
     else if ($site && (!$this->metadata['attributionName'] || !creativecommons_metadata_is_available('attributionName'))) {
       // CC0
       if ($this->type == 'zero') {
-        $html .= t('To the extent possible under law, the person who associated CC0 with this work, <a rel="cc:attributionURL" href="@cc:attributionURL" property="dc:title">@dc:title</a>, has waived all copyright and related or neighboring rights to this <span rel="dc:type" href="@dc:type-uri">@dc:type-name</span>, although certain works referenced herein may be separately licensed.', $args);
+        $html .= t('To the extent possible under law, the person who associated CC0 with this work, !title-link, has waived all copyright and related or neighboring rights to this !type-span, although certain works referenced herein may be separately licensed.', $args);
       }
       // PD Mark
       else if ($this->type == 'mark') {
-        $html .= t('This <span rel="dc:type" href="@dc:type-uri">@dc:type-name</span>, <a rel="cc:attributionURL" href="@cc:attributionURL" property="dc:title">@dc:title</a>, is free of known copyright restrictions.', $args);
+        $html .= t('This !type-span, !title-link, is free of known copyright restrictions.', $args);
       }
       // Rest
       else {
-        $html .= t('This <span rel="dc:type" href="@dc:type-uri">@dc:type-name</span>, <a rel="cc:attributionURL" href="@cc:attributionURL" property="dc:title">@dc:title</a>, is licensed under a <a rel="license" href="@license-uri">@license-name license</a>, although certain works referenced herein may be separately licensed.', $args);
+        $html .= t('This !type-span, !title-link, is licensed under a <a rel="license" href="@license-uri">@license-name license</a>, although certain works referenced herein may be separately licensed.', $args);
       }
     }
     // Otherwise
     else {
       // CC0
       if ($this->type == 'zero') {
-        $html .= t('To the extent possible under law, <a rel="cc:attributionURL" href="@cc:attributionURL" property="cc:attributionName">@cc:attributionName</a> has waived all copyright and related or neighboring rights to this <span rel="dc:type" href="@dc:type-uri">@dc:type-name</span>, <span property="dc:title">@dc:title</span>.', $args);
+        $html .= t('To the extent possible under law, !name-link has waived all copyright and related or neighboring rights to this !type-span, !title-span.', $args);
       }
       // PD Mark
       else if ($this->type == 'mark') {
-        $html .= t('This <span rel="dc:type" href="@dc:type-uri">@dc:type-name</span>, <span property="dc:title">@dc:title</span>, by <a rel="cc:attributionURL" href="@cc:attributionURL" property="cc:attributionName">@cc:attributionName</a>, is free of known copyright restrictions.', $args);
+        $html .= t('This !type-span, !title-span, by !name-link, is free of known copyright restrictions.', $args);
       }
       // All Rights Reserved
       else if ($this->type == 'all-rights-reserved') {
-        $html .= t('To the extent possible under law, all copyright and related or neighboring rights to this <span rel="dc:type" href="@dc:type-uri">@dc:type-name</span>, <span property="dc:title">@dc:title</span>, by @cc:attributionName are Reserved.', $args);
+        $html .= t('To the extent possible under law, all copyright and related or neighboring rights to this !type-span, !title-span, by !name are Reserved.', $args);
       }
       // Rest
       else {
-        $html .= t('This <span rel="dc:type" href="@dc:type-uri">@dc:type-name</span>, <span property="dc:title">@dc:title</span>, by <a rel="cc:attributionURL" href="@cc:attributionURL" property="cc:attributionName">@cc:attributionName</a> is licensed under a <a rel="license" href="@license-uri">@license-name license</a>.', $args);
+        $html .= t('This !type-span, !title-span, by !name-link is licensed under a <a rel="license" href="@license-uri">@license-name license</a>.', $args);
       }
     }
 
@@ -465,21 +470,21 @@ class creativecommons_license {
 
     // CC+
     if ($this->metadata['morePermissions'] && creativecommons_metadata_is_available('morePermissions')) {
-      $html .= ' '. t('There are <a rel="cc:morePermissions" href="@cc:morePermissions">alternative licensing options</a> available.', array('@cc:morePermissions' => $this->metadata['morePermissions']));
+      $cc_more_permissions = check_plain($this->metadata['morePermissions']);
+      $more_permissions_link = l(t('alternative licensing options'), $cc_more_permissions, array('attributes' => array('rel' => 'cc:morePermissions')));
+      $html .= ' '. t('There are !alternative-licensing-options available.', array('!alternative-licensing-options' => $more_permissions_link));
     }
 
     // dc:description
     if ($this->metadata['description'] && creativecommons_metadata_is_available('description')) {
-      $html .= '<p>'. t('<span property="dc:description">@dc:description</span>', array('@dc:description' => $this->metadata['description'])) .'</p>';
+      $html .= '<p><span property="dc:description">' . check_plain($this->metadata['description']) . '</span></p>';
     }
 
     // dc:year
     if (($this->metadata['date'] && creativecommons_metadata_is_available('date')) || ($this->metadata['rights'] && creativecommons_metadata_is_available('date'))) {
-      $args = array(
-        '@dc:date' => creativecommons_metadata_is_available('date') ? $this->metadata['date'] : '',
-        '@dc:rights' => creativecommons_metadata_is_available('rights') ? $this->metadata['rights'] : '',
-      );
-      $html .= '<p>'. t('Copyright &copy; <span property="dc:date">@dc:date</span> <span property="dc:rights">@dc:rights</span>', $args) .'</p>';
+      $dc_date = creativecommons_metadata_is_available('date') ? $this->metadata['date'] : '';
+      $dc_rights = creativecommons_metadata_is_available('rights') ? $this->metadata['rights'] : '';
+      $html .= '<p>'. t('Copyright') . ' &copy; <span property="dc:date">' . check_plain($dc_date) . '</span> <span property="dc:rights">' . check_plain($dc_rights) . '</span></p>';
     }