diff --git a/modules/comment.inc b/modules/comment.inc
index c673031..1159e06 100644
--- a/modules/comment.inc
+++ b/modules/comment.inc
@@ -7,7 +7,7 @@ function comment_styleguide() {
   global $conf, $user;
   $user_register = $conf['user_register'];
   $account = clone $user;
-  $user->uid = 0;
+//  $user->uid = 0;
   $conf['comment_form_location_-styleguide-'] = COMMENT_FORM_SEPARATE_PAGE;
   $conf['user_register'] = TRUE;
 
diff --git a/styleguide.info b/styleguide.info
deleted file mode 100644
index a56eaad..0000000
--- a/styleguide.info
+++ /dev/null
@@ -1,6 +0,0 @@
-name = Style guide
-description = Generates a theme style guide for proofing common elements.
-core = 7.x
-files[] = styleguide.module
-files[] = styleguide.styleguide.inc
-
diff --git a/styleguide.info.yml b/styleguide.info.yml
new file mode 100644
index 0000000..c01e20f
--- /dev/null
+++ b/styleguide.info.yml
@@ -0,0 +1,5 @@
+name: Style guide
+type: module
+description: Generates a theme style guide for proofing common elements.
+core: 8.x
+
diff --git a/styleguide.styleguide.inc b/styleguide.styleguide.inc
index f02d79c..86960b4 100644
--- a/styleguide.styleguide.inc
+++ b/styleguide.styleguide.inc
@@ -286,12 +286,13 @@ function styleguide_styleguide() {
     'content' => theme('progress_bar', array('percent' => 57, 'message' => styleguide_sentence(2))),
     'group' => t('User interface')
   );
+  // TODO: use new breadcrumb approach: https://drupal.org/node/2026025
   // Use alternative item name to avoid conflict with main breadcrumb.
-  $items['styleguide_breadcrumb'] = array(
-    'title' => t('Breadcrumb'),
-    'content' => theme('breadcrumb', array('breadcrumb' => drupal_get_breadcrumb())),
-    'group' => t('User interface')
-  );
+//  $items['styleguide_breadcrumb'] = array(
+//    'title' => t('Breadcrumb'),
+//    'content' => theme('breadcrumb', array('breadcrumb' => drupal_get_breadcrumb())),
+//    'group' => t('User interface')
+//  );
   $items['link'] = array(
     'title' => t('Link'),
     'content' => l(styleguide_word(2), $current_url),