diff --git a/themes/varia/templates/article.html b/themes/varia/templates/article.html
index 3eaf40e6e..f8a61fc2e 100644
--- a/themes/varia/templates/article.html
+++ b/themes/varia/templates/article.html
@@ -30,9 +30,16 @@
 		</div>
 		<div class="article-info">
 			<div class="featured-image">
-				{% if article.featured_image %}
-					<img src="{{ article.featured_image }}">
-				{% endif %}
+                {% if article.featured_image %}
+                {% set thumb_size ='/thumb'%}
+                    <a href="{{ article.featured_image }}">
+                        {% if article.featured_image.endswith('.gif') %}
+                            {% set thumb_size =''%}
+                        {% endif %}
+                        <img src="{{ article.featured_image | replace('images','images'+thumb_size) }}">
+
+                    </a>
+                {% endif %}
 			</div>
 			<div class="event-details">
 				{% if article.event_start %}
diff --git a/themes/varia/templates/index.html b/themes/varia/templates/index.html
index e49565c03..65b0e7a09 100644
--- a/themes/varia/templates/index.html
+++ b/themes/varia/templates/index.html
@@ -5,75 +5,82 @@
     {% for p in pages %}
         {% if p.title == 'header' %}
             <div id="title">
-            	{{ p.content }}
-		    </div>		
+                {{ p.content }}
+            </div>      
         {% endif %}
     {% endfor %}
 </header>
 {% block content_title %}
 {% endblock %}
 {% if articles_page.has_other_pages() %}
-	{% include 'pagination.html' %}
+    {% include 'pagination.html' %}
 {% endif %}
 <div id="post-list">
 
 {% for article in articles_page.object_list %}
-	{% if article.category %}
+    {% if article.category %}
         {% if article.event_start %}
             {% set event_status = '' %}
+            {% set thumb_size = '/thumb' %}
             {% if article.event_start < article.date.now() %}
                 {% set event_status = ' past' %}
             {% endif %}
             {% if article.event_start >= article.date.now() %}
                 {% set event_status = ' current' %}
+                {% set thumb_size = '/thumb2x' %}
             {% endif %}
         {% endif %}
 
-	<article class="hentry {{article.category}}{{event_status}}">
-	{% endif %}
-		<div class="article-info">
-			<span class="entry-title"><a href="{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></span>
-			{% if article.event_start %}
+    <article class="hentry {{article.category}}{{event_status}}">
+    {% endif %}
+        <div class="article-info">
+            <span class="entry-title"><a href="{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></span>
+            {% if article.event_start %}
                 <div class="event-details">
                     {{ article.event_start  | strftime('%d %B %Y') }}
-                    {% set event_status = '' %}
+                    <!-- {% set event_status = '' %} -->
                 </div>
             {% endif %}
-			<div class="featured-image {{event_status}}">
-				{% if article.featured_image %}
-					<a href="{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">
-						<img src="{{ article.featured_image }}">
-					</a>
-				{% endif %}
-			</div>
-		</div>
-		<div class="summary {{ article.category }}">{{ article.summary }}
-			<span>
-				{% if DEFAULT_LANG == 'en' %}
-					<a href="/en/{{ article.url }}">read more</a>
-				{% elif DEFAULT_LANG == 'nl' %}
-					<a href="/{{ article.url }}">lees meer</a>
-				{% endif %}
-			</span>
-		</div>
-		<div class="separator"><hr></div>
-		<div class="post-info">
-			{% if article.category %}
-			<div class="categories">
-				<span itemprop="articleSection">
-					<a href="/{{ article.category.url }}" rel="category">{{ article.category }}</a>
-				</span>
-			</div>
-			{% endif %} {% if article.tags %}
-			<div class="tags">
-				Tags: {% for tag in article.tags %}
-				<span itemprop="keywords">
-					<a href="/{{ tag.url }}" rel="tag">{{ tag }}</a>
-				</span> {% endfor %}
-			</div>
-			{% endif %}
-		</div>
-	</article>
+            <div class="featured-image {{event_status}}">
+                {% if article.featured_image %}
+                    <a href="{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">
+                        {% if article.featured_image.endswith('.gif') %}
+                            {% set thumb_size =''%}
+                        {% endif %}
+                        <img src="{{ article.featured_image | replace('images','images'+thumb_size) }}">
+
+                    </a>
+                {% endif %}
+            </div>
+        </div>
+   
+        <div class="summary {{ article.category }}">{{ article.summary }}
+            <span>
+                {% if DEFAULT_LANG == 'en' %}
+                    <a href="/en/{{ article.url }}">read more</a>
+                {% elif DEFAULT_LANG == 'nl' %}
+                    <a href="/{{ article.url }}">lees meer</a>
+                {% endif %}
+            </span>
+        </div>
+        <div class="separator"><hr></div>
+        <div class="post-info">
+            {% if article.category %}
+            <div class="categories">
+                <span itemprop="articleSection">
+                    <a href="/{{ article.category.url }}" rel="category">{{ article.category }}</a>
+                </span>
+            </div>
+            {% endif %} {% if article.tags %}
+            <div class="tags">
+                Tags: {% for tag in article.tags %}
+                <span itemprop="keywords">
+                    <a href="/{{ tag.url }}" rel="tag">{{ tag }}</a>
+                </span> {% endfor %}
+            </div>
+            {% endif %}
+        </div>
+    </article>
 {% endfor %}
 </div><!-- /#posts-list -->