diff --git a/templates/adminAlbumMedia.hamlet b/templates/adminAlbumMedia.hamlet
index 5214f62..8950781 100755
--- a/templates/adminAlbumMedia.hamlet
+++ b/templates/adminAlbumMedia.hamlet
@@ -8,6 +8,6 @@ $newline always
 $forall (Entity mId m) <- media
   <article class="item" data-width=#{mediumThumbWidth m}>
     <a href=@{AdminMediumSettingsR mId}>
-      <figure class="thumbnail">
+      <figure>
         <img src=@{StaticR $ StaticRoute (drop 2 $ map T.pack $ splitDirectories $ mediumThumb m) []}>
         <figcaption>#{mediumTitle m}
diff --git a/templates/adminAlbums.hamlet b/templates/adminAlbums.hamlet
index 34ae0ec..a3e0259 100755
--- a/templates/adminAlbums.hamlet
+++ b/templates/adminAlbums.hamlet
@@ -8,7 +8,7 @@ $newline always
 $forall (Entity aId a) <- albums
   <article class="item" data-width=#{albumSampleWidth a}>
     <a href=@{AdminAlbumSettingsR aId}>
-      <figure class="thumbnail">
+      <figure>
         $if (albumSamplePic a) == Nothing
           <img src="/static/img/album.jpg">
         $else
diff --git a/templates/adminMedia.hamlet b/templates/adminMedia.hamlet
index 91088a2..7e35576 100755
--- a/templates/adminMedia.hamlet
+++ b/templates/adminMedia.hamlet
@@ -8,6 +8,6 @@ $newline always
 $forall (Entity mId m) <- media
   <article class="item" data-width=#{mediumThumbWidth m}>
     <a href=@{AdminMediumSettingsR mId}>
-      <figure class="thumbnail">
+      <figure>
         <img src=@{StaticR $ StaticRoute (drop 2 $ map T.pack $ splitDirectories $ mediumThumb m) []}>
         <figcaption>#{mediumTitle m}
diff --git a/templates/adminUserAlbums.hamlet b/templates/adminUserAlbums.hamlet
index f5d21a7..cdd2880 100755
--- a/templates/adminUserAlbums.hamlet
+++ b/templates/adminUserAlbums.hamlet
@@ -9,7 +9,7 @@ $newline always
 $forall (Entity aId a) <- albums
   <article class="item" data-width=#{albumSampleWidth a}>
     <a href=@{AdminAlbumSettingsR aId}>#{albumTitle a}
-      <figure class="thumbnail">
+      <figure>
         $if (albumSamplePic a) == Nothing
           <img src="/static/img/album.jpg">
         $else
diff --git a/templates/adminUserMedia.hamlet b/templates/adminUserMedia.hamlet
index 31441f1..bfe9ce7 100755
--- a/templates/adminUserMedia.hamlet
+++ b/templates/adminUserMedia.hamlet
@@ -9,6 +9,6 @@ $newline always
 $forall (Entity mId m) <- media
   <article class="item" data-width=#{mediumThumbWidth m}>
     <a href=@{AdminMediumSettingsR mId}>#{mediumTitle m}
-      <figure class="thumbnail">
+      <figure>
         <img src=@{StaticR $ StaticRoute (drop 2 $ map T.pack $ splitDirectories $ mediumThumb m) []}>
         <figcaption>#{mediumTitle m}
diff --git a/templates/album.hamlet b/templates/album.hamlet
index 2c189e5..f884fe4 100755
--- a/templates/album.hamlet
+++ b/templates/album.hamlet
@@ -17,6 +17,6 @@ $else
   $forall (Entity mediumId medium) <- media
     <article class="item" data-width=#{mediumThumbWidth medium}>
       <a href=@{MediumR mediumId}>
-        <figure class="thumbnail">
+        <figure>
           <img src=@{StaticR $ StaticRoute (drop 2 $ map T.pack $ splitDirectories $ mediumThumb medium) []} title=#{mediumTitle medium}>
           <figcaption>#{mediumTitle medium}
diff --git a/templates/profile.hamlet b/templates/profile.hamlet
index 9357dbb..7fd21fa 100755
--- a/templates/profile.hamlet
+++ b/templates/profile.hamlet
@@ -16,7 +16,7 @@ $newline always
 $forall (Entity albumId album) <- userAlbs
   <article class="item" data-width=#{albumSampleWidth album}>
     <a href=@{AlbumR albumId}>
-      <figure class="thumbnail">
+      <figure>
         $if (albumSamplePic album) == Nothing
           <img src=@{StaticR img_album_jpg} title=#{albumTitle album}>
         $else
@@ -32,7 +32,7 @@ $else
   $forall Just (Entity albumId album) <- sharedAlbs
     <article class="shared item" data-width=#{albumSampleWidth album}>
       <a href=@{AlbumR albumId}>
-        <figure class="thumbnail">
+        <figure>
           $if (albumSamplePic album) == Nothing
             <img src=@{StaticR img_album_jpg}>
           $else
@@ -48,6 +48,6 @@ $else
   $forall (Entity mediumId medium) <- take 10 recentMedia
     <article class="recent item" data-width=#{mediumThumbWidth medium}>
       <a href=@{MediumR mediumId}>
-        <figure class="thumbnail">
+        <figure>
           <img src=@{StaticR $ StaticRoute (drop 2 $ map T.pack $ splitDirectories $ mediumThumb medium) []} title=#{mediumTitle medium}>
           <figcaption>#{mediumTitle medium}
diff --git a/templates/result.hamlet b/templates/result.hamlet
index ae8d860..4b8abe8 100755
--- a/templates/result.hamlet
+++ b/templates/result.hamlet
@@ -27,7 +27,7 @@ $else
     $forall (Entity aId album) <- albumList
       <article .item data-width="#{albumSampleWidth album}">
         <a href=@{AlbumR aId}>
-          <figure .thumbnail>
+          <figure>
             $if (albumSamplePic album) == Nothing
               <img src=@{StaticR img_album_jpg} title=#{albumTitle album}>
             $else
@@ -41,7 +41,7 @@ $else
     $forall (Entity mId medium) <- mediumList
       <article .item data-width="#{mediumThumbWidth medium}">
         <a href=@{MediumR mId}>
-          <figure .thumbnail>
+          <figure>
             <img src=@{StaticR $ StaticRoute (drop 2 $ map T.pack $ splitDirectories $ mediumThumb medium) []} title=#{mediumTitle medium}>
             <figcaption>#{mediumTitle medium}
   $if not $ null commentList
diff --git a/templates/tagMedia.hamlet b/templates/tagMedia.hamlet
index ac0612d..6d5e8b4 100755
--- a/templates/tagMedia.hamlet
+++ b/templates/tagMedia.hamlet
@@ -8,6 +8,6 @@ $newline always
 $forall Just (Entity mId m) <- media
   <article class="item" data-width=#{mediumThumbWidth m}>
     <a href=@{MediumR mId}>
-      <figure class="thumbnail">
+      <figure>
         <img src=@{StaticR $ StaticRoute (drop 2 $ map T.pack $ splitDirectories $ mediumThumb m) []} title=#{mediumTitle m}>
         <figcapion>#{mediumTitle m}