diff --git a/.DS_Store b/.DS_Store
index caf0f17..ad16089 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/app/__init__.py b/app/__init__.py
index 1ecdd02..15afa74 100755
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -15,7 +15,7 @@ registry.register("rqlite.pyrqlite", "sqlalchemy_rqlite.pyrqlite", "dialect")
 basedir = os.path.abspath(os.path.dirname(__file__))
 
 UPLOAD_FOLDER = os.path.join(basedir, 'uploads')
-UPLOAD_FOLDER_COVER = os.path.join(basedir, 'uploads/cover')
+UPLOAD_FOLDER_COVER = os.path.join(basedir, 'cover')
 #ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif'])
 load_dotenv(find_dotenv())
 app = Flask(__name__)
@@ -29,7 +29,7 @@ app.config['PORT'] = 80
 
 #app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///' + os.path.join(basedir, 'mydatabase.db')
 db = SQLAlchemy(app)
-
+light = not os.path.isdir(UPLOAD_FOLDER)
 DOMAIN = environ.get('DOMAIN')
 socketio = SocketIO(app)
 
diff --git a/app/cover.py b/app/cover.py
index ef1bccc..19de8e1 100755
--- a/app/cover.py
+++ b/app/cover.py
@@ -37,8 +37,8 @@ def get_cover(file_path, filename):
 
     # Convert each page to a png image.
     for page in pages:
-        big_filename = "app/uploads/cover/"+page["filename"] + "_cover.png"
-        small_filename = "app/uploads/cover/"+page["filename"] + "cover_small" + ".png"
+        big_filename = "app/cover/"+page["filename"] + "_cover.png"
+        small_filename = "app/cover/"+page["filename"] + "cover_small" + ".png"
 
         img = pdf_page_to_png(src_pdf, pagenum = page["pagenum"], resolution = 200)
         img.save(filename = big_filename)
diff --git a/app/templates/add_to_stacks.html b/app/templates/add_to_stacks.html
index 2e7ab09..6cece35 100644
--- a/app/templates/add_to_stacks.html
+++ b/app/templates/add_to_stacks.html
@@ -6,7 +6,7 @@
 <div> Chosen book:
 
     <h1 class="header">{{ book.title }}</h1>
-    <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="150" onerror="if (this.src != '../static/img/{{ book.cover }}') this.src = '../static/img/default_cover.gif';">
+    <img class="no_cover" id="{{ book.title }}" src="../cover/{{ book.cover }}" width="150" onerror="if (this.src != '../static/img/{{ book.cover }}') this.src = '../static/img/default_cover.gif';">
 
 </div>
 <p>These are all the stacks that have been built so far.</p>
diff --git a/app/templates/header.html b/app/templates/header.html
index 0d8b33d..fc9abe5 100755
--- a/app/templates/header.html
+++ b/app/templates/header.html
@@ -3,10 +3,16 @@
             <li><a href="{{ url_for('home') }}">Home</a></li>
             <li><a href="{{ url_for('show_books') }}">Catalogue</a></li>
             <li><a href="{{ url_for('show_stacks') }}">Stacks</a></li>
+            {%if light%}
+            {%else%}
             <li><a href="{{ url_for('add_book') }}">Add Book</a></li>
             <li><a href="{{ url_for ('add_stack') }}">Add Stack</a></li>
+            {%endif%}
             <li><a href="{{ url_for('about') }}">About</a></li>
+            {%if light%}
+            {%else%}
             <li><a href="{{ url_for('show_instances') }}">Instances</a></li>
+            {%endif%}
           </ul>
           <div class="clearfix"></div>
 </nav>
diff --git a/app/templates/home.html b/app/templates/home.html
index 80eb66d..f406a4e 100755
--- a/app/templates/home.html
+++ b/app/templates/home.html
@@ -15,6 +15,8 @@ Feel free to browse our catalogue, interfaced in many different ways.
 
 <br><br><br>
 
+{%if light%}
+{%else%}
 <form method="GET" action="/export/csv">
    <button type="submit">Export Catalogue (.CSV)</button>
 </form>
@@ -23,6 +25,7 @@ Feel free to browse our catalogue, interfaced in many different ways.
    <button type = "button" onclick="document.getElementById('file_import_csv').click()">Import Catalogue (.CSV)</button>
 </form>
 </div>
+{%endif%}
 
 <div id="app" class="container">
   <div class="messageback1"></div>
diff --git a/app/templates/red_link.html b/app/templates/red_link.html
index 77883b0..74c58b2 100755
--- a/app/templates/red_link.html
+++ b/app/templates/red_link.html
@@ -32,10 +32,13 @@
       </div>
     {% endif %}
   {% endwith %}
+  {%if light%}
+  {%else%}
   <div style="width: 220px; float: left; padding-right: 40px;">
     <img class="no_cover" width="220" src = '/static/img/default_cover.gif';>
   </div>
   <br>
+
   <div>
         <h2>Add this book:</h2>
 
@@ -72,6 +75,7 @@
 <br>
 <br>
 </div>
+  {%endif%}
 <div class= "Container" style= "border-top: dashed; border-width: 1px;">
 <h2> More potential books </h2>
 <table class="library_table" id="table" style="width:100%">
@@ -83,7 +87,10 @@
       <th width="100px;">Year</th>
       <th width="100px;">Category</th>
       <th width="100px;">Stack</th>
+      {%if light%}
+      {%else%}
       <th width="100px;">Add to a stack</th>
+      {%endif%}
     </tr>
     </thead>
     <tbody>
@@ -91,7 +98,7 @@
     <tr>
       <td style= "padding: 5px;">
 
-        <img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="70" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';">
+        <img class="no_cover" id="{{ book.title }}" src="/cover/{{ book.cover }}" width="70" onerror="if (this.src != '/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';">
       <!--  <object class="no_cover" data="../static/img/default_cover.png" type="image/png" width="65">
           <p hidden="True"></p>
 
@@ -118,10 +125,13 @@
 
 
               </td>
+              {%if light%}
+              {%else%}
       <td id='plus'><a href="{{url_for('add_to_stack', id=book.id)}}">
 
       ===>
               </a></td>
+              {%endif%}
     </tr>
 
   {% endfor %}
diff --git a/app/templates/results.html b/app/templates/results.html
index 296dc8e..82b1ab8 100644
--- a/app/templates/results.html
+++ b/app/templates/results.html
@@ -9,12 +9,12 @@
       {{ render_field(form.search) }} </div>
       <button type="submit" class="button">browse</button>
      <p><br>
-      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>    
+      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>
     </form>
     </div>
 
   <br>
-  <h3 style="line-height:0px;"">Results: "{{ query }}" included in {{ count }} out of {{ whole }} items </h3>
+  <h3 style="line-height:0px;">Results: "{{ query }}" included in {{ count }} out of {{ whole }} items </h3>
   <div style="height: 20px; background-color: yellow; line-height:4px;">
     <div style="background-color: black; width: {{ percentage }}%; height: 100%;"></div>
 </div>
@@ -39,13 +39,15 @@
       <th width="100px;">Year</th>
       <th width="100px;">Category</th>
       <th width="100px;">Stack</th>
+      {%if light%}
+      {%else%}
       <th width="100px;">Add to stack</th>
-
+      {%endif%}
     </tr>
         {% for book in books %}
     <tr>
     <td style= "padding: 5px;">
-<img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="70" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></td>
+<img class="no_cover" id="{{ book.title }}" src="/cover/{{ book.cover }}" width="70" onerror="if (this.src != '/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></td>
       <td><a href="{{url_for('show_book_by_id', id=book.id)}}">{{ book.title }}</a></td>
 
       <td>  {% for author in book.authors %}
@@ -60,9 +62,12 @@
               <li><a href="{{url_for('show_stack_by_id', id=stack.id)}}">{{ stack.stack_name }}</a>  </li>
               {% endfor %}
       </td>
+      {%if light%}
+      {%else%}
       <td id='plus'><a href="{{url_for('add_to_stack', id=book.id)}}">
           ==>
               </a></td>
+      {%endif%}
       {% endfor %}
 
   </table>
@@ -81,12 +86,14 @@
       <th width="100px;">Year</th>
       <th width="100px;">Category</th>
       <th width="100px;">Stack</th>
+      {%if light%}
+      {%else%}
       <th width="100px;">Add to stack</th>
-
+      {%endif%}
     </tr>
         {% for book in books_all %}
     <tr>
-      <td style= "padding: 5px;"><img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="80" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></td>
+      <td style= "padding: 5px;"><img class="no_cover" id="{{ book.title }}" src="/cover/{{ book.cover }}" width="80" onerror="if (this.src != '/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></td>
       <td><a href="{{url_for('show_book_by_id', id=book.id)}}">{{ book.title }}</a></td>
 
       <td>  {% for author in book.authors %}
@@ -102,10 +109,12 @@
                     {% endfor %}
 
       </td>
+      {%if light%}
+      {%else%}
       <td id='plus'><a href="{{url_for('add_to_stack', id=book.id)}}">
           ==>
               </a></td>
-
+      {%endif%}
   {% endfor %}
   </table>
   <p>
diff --git a/app/templates/results_grid.html b/app/templates/results_grid.html
index 228f7db..2b05a2b 100644
--- a/app/templates/results_grid.html
+++ b/app/templates/results_grid.html
@@ -9,12 +9,12 @@
       {{ render_field(form.search) }} </div>
       <button type="submit" class="button">browse</button>
            <p><br>
-      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>  
+      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>
 </form>
     </div>
 
   <br>
-  <h3 style="line-height:0px;"">Results: "{{ query }}" included in {{ count }} out of {{ whole }} items </h3>
+  <h3 style="line-height:0px;">Results: "{{ query }}" included in {{ count }} out of {{ whole }} items </h3>
   <div style="height: 20px; background-color: yellow; line-height:4px;">
     <div style="background-color: black; width: {{ percentage }}%; height: 100%;"></div>
 </div>
@@ -37,7 +37,7 @@
 
 <div class="gridbox">
 <a href="/books/{{ book.id }}">
-<img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="100%" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></a> 
+<img class="no_cover" id="{{ book.title }}" src="/cover/{{ book.cover }}" width="100%" onerror="if (this.src != '/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></a>
 <p>
 <tbody>
 <th>
@@ -58,10 +58,10 @@
 <div class="grid">
 
 {% for book in books_all|sort(attribute='title', reverse = False) %}
-  
+
 <div class="gridbox">
 <a href="books/{{ book.id }}">
-<img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="100%" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></a> 
+<img class="no_cover" id="{{ book.title }}" src="/cover/{{ book.cover }}" width="100%" onerror="if (this.src != '/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></a>
 <p>
 <tbody>
 <th>
diff --git a/app/templates/scape.html b/app/templates/scape.html
index 9309669..1e25e19 100644
--- a/app/templates/scape.html
+++ b/app/templates/scape.html
@@ -74,7 +74,7 @@
     <div class = "drag" id = "{{ book.id }}" style="position: absolute;width:70px;height:auto; top:{{ book.scapeY }}px; left:{{ book.scapeX }}px;">
 
 
-      <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" style="width:100%;height:auto;" onerror="if (this.src != '../static/img/default_cover.gif') this.src = '../static/img/default_cover.gif';">
+      <img class="no_cover" id="{{ book.title }}" src="../cover/{{ book.cover }}" style="width:100%;height:auto;" onerror="if (this.src != '../static/img/default_cover.gif') this.src = '../static/img/default_cover.gif';">
       <p class="booktitle" style="font-size:7px;"><a href="books/{{ book.id }}">{{ book.title }}</a></p>
 
       {% set got = {} %}
diff --git a/app/templates/show_book_detail.html b/app/templates/show_book_detail.html
index de90bb0..153307b 100755
--- a/app/templates/show_book_detail.html
+++ b/app/templates/show_book_detail.html
@@ -5,7 +5,7 @@
 
   <h1 class="header">{{ book.title }}</h1>
 <div style="float:right; padding-right: 140px;">
- <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="280px" onerror="if (this.src != '../uploads/cover/{{ book.cover }}') this.src = '../static/img/default_cover.gif';"></div>
+ <img class="no_cover" id="{{ book.title }}" src="../cover/{{ book.cover }}" width="280px" onerror="if (this.src != '../cover/{{ book.cover }}') this.src = '../static/img/default_cover.gif';"></div>
 
   <table class="library_table" id="table" style="width:50%; padding-bottom: 80px;">
 <thead>
@@ -81,6 +81,8 @@
 
 </tbody>
   </table>
+  {%if light%}
+  {%else%}
   <br>
 <a href="{{url_for('add_to_stack', id=book.id)}}">Add book to Stack ===></a> <br><br>
   <br>
@@ -98,10 +100,10 @@
 {% else %}
 {% endif %}
 
-  <button style= "font-size: 10pt;"> <a href="{{ url_for('edit_book_by_id', id=book.id )}}">edit</a></button>
-  <button style= "font-size: 10pt;"> <a href="{{ url_for('remove_book_by_id', id=book.id)}}">delete</a></button>
+  <a href="{{ url_for('edit_book_by_id', id=book.id )}}"><button style= "font-size: 10pt;"> edit</button></a>
+  <a href="{{ url_for('remove_book_by_id', id=book.id)}}"><button style= "font-size: 10pt;"> delete</button></a>
 <br><br>
-
+{%endif%}
 <hr>
 {% if previousbook %}
 <a href="{{ url_for('show_book_by_id', id=previousbook.id )}}" style="font-size: 9pt;"> < see the previous book added to XPPL: &nbsp;<i>{{ previousbook.title |truncate(40,True,'...') }} </i></a> {% endif %}
diff --git a/app/templates/show_books.html b/app/templates/show_books.html
index 94dba3b..a153bee 100755
--- a/app/templates/show_books.html
+++ b/app/templates/show_books.html
@@ -36,7 +36,10 @@
       <th width="100px;">Year</th>
       <th width="100px;">Category</th>
       <th width="100px;">Stack</th>
+      {%if light%}
+      {%else%}
       <th width="100px;">Add to a stack</th>
+      {%endif%}
     </tr>
     </thead>
     <tbody>
@@ -44,7 +47,7 @@
     <tr>
       <td style= "padding: 5px;">
 
-        <img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="70" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';">
+        <img class="no_cover" id="{{ book.title }}" src="/cover/{{ book.cover }}" width="70" onerror="if (this.src != '/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';">
       <!--  <object class="no_cover" data="../static/img/default_cover.png" type="image/png" width="65">
           <p hidden="True"></p>
 
@@ -75,10 +78,13 @@
 
 
               </td>
+              {%if light%}
+              {%else%}
+
       <td id='plus'><a href="{{url_for('add_to_stack', id=book.id)}}">
 
       ===>
-              </a></td>
+              </a></td>{%endif%}
     </tr>
 
   {% endfor %}
diff --git a/app/templates/show_books_grid.html b/app/templates/show_books_grid.html
index cc2c2f3..9c772f6 100644
--- a/app/templates/show_books_grid.html
+++ b/app/templates/show_books_grid.html
@@ -9,7 +9,7 @@
       {{ render_field(form.search) }} </div>
       <button type="submit" class="button">browse</button>
            <p><br>
-      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p> 
+      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>
  </form>
     </div>
 
@@ -34,7 +34,7 @@
 
 <div class="gridbox">
 <a href="books/{{ book.id }}">
-<img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="100%" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></a> 
+<img class="no_cover" id="{{ book.title }}" src="/cover/{{ book.cover }}" width="100%" onerror="if (this.src != '/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></a> 
 <p>
 <tbody>
 <th>
diff --git a/app/templates/show_stack_detail.html b/app/templates/show_stack_detail.html
index b40c49d..d33e520 100644
--- a/app/templates/show_stack_detail.html
+++ b/app/templates/show_stack_detail.html
@@ -26,7 +26,7 @@
   {% endif %}
 
           <li>  <a href="{{url_for('show_book_by_id', id=book.id)}}">{{book.title}}</a> </li>
-          <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="150" onerror="if (this.src != '../uploads/cover/{{ book.cover }}') this.src = '../static/img/default_cover.gif';">
+          <img class="no_cover" id="{{ book.title }}" src="../cover/{{ book.cover }}" width="150" onerror="if (this.src != '../cover/{{ book.cover }}') this.src = '../static/img/default_cover.gif';">
 <div class='widget'>
           <iframe src="../uploads/{{ book.file }}" width="50%" ></iframe>
 </div>
@@ -36,9 +36,12 @@
 
   <br>
   <br>
+  {%if light%}
+  {%else%}
   <p><a href="{{url_for('show_books')}}">Add some more books</a></p>
 <p><a href="{{ url_for('edit_stack_by_id', id=stack.id )}}">Edit title and/or description</a> </p>
   <p><a href="{{ url_for('remove_stack_by_id', id=stack.id )}}">Remove stack</a> </p>
+  {%endif%}
 <p><a href="{{url_for('show_stacks')}}">Go back to the other stacks</p>
 
 </div>
diff --git a/app/views.py b/app/views.py
index c32bf75..2a742eb 100755
--- a/app/views.py
+++ b/app/views.py
@@ -5,9 +5,10 @@ Werkzeug Documentation:  http://werkzeug.pocoo.org/documentation/
 This file creates your application.
 """
 
-from app import app, db, socketio, DOMAIN
+from app import app, db, socketio, DOMAIN, light
 from flask import Flask, Response, session, render_template, request, redirect, url_for, flash, send_from_directory, jsonify, abort
 import json
+from functools import wraps
 from  sqlalchemy.sql.expression import func, select
 from sqlalchemy.sql import except_
 from app.forms import UploadForm, EditForm, SearchForm, ChatForm, StackForm, AddtoStackForm, EditStackForm
@@ -47,26 +48,34 @@ def allowed_file(filename):
 # Routing for your application.
 ###
 
+
+
+def check_light(func):
+    @wraps(func)
+    def decorated_function(*args, **kwargs):
+        if not light:
+            return func(*args, **kwargs)
+        else:
+            flash("Your account has expired. Update your billing info.")
+            return redirect(url_for('home'))
+
+    return decorated_function
+
+
 @app.route('/', methods= ['POST','GET'])
 def home():
+    print("/////////////")
+    print(light)
     chat_form = ChatForm()
     chat_messages = db.session.query(Chat).all()
     username = 'librarian'
-
-    # if request.method == 'POST':
-    #     if chat_form.validate_on_submit():
-    #         message = chat_form.message.data
-    #         msg = Chat(message)
-    #         db.session.add(msg)
-    #         db.session.commit()
-    #client = request.remote_addr
     server = request.host
     if request.environ.get('HTTP_X_FORWARDED_FOR') is None:
         client =request.environ['REMOTE_ADDR']
     else:
         client = request.environ['HTTP_X_FORWARDED_FOR']
 
-    return render_template('home.html',domain=DOMAIN,chat=chat_messages, channel = 1, username=username, client=client, server=server)
+    return render_template('home.html',domain=DOMAIN,chat=chat_messages, channel = 1, username=username, client=client, server=server, light=light)
 
 @app.route('/hello/<name>')
 def hello(name):
@@ -75,9 +84,10 @@ def hello(name):
 @app.route('/about/')
 def about():
     """Render the website's about page."""
-    return render_template('about.html', name="Mary Jane")
+    return render_template('about.html', light=light)
 
 @app.route('/uploads/<filename>')
+@check_light
 def uploaded_file(filename):
     book = Book.query.filter_by(file=filename).first()
     i = Instance(request.host, "download")
@@ -89,7 +99,7 @@ def uploaded_file(filename):
     return send_from_directory(app.config['UPLOAD_FOLDER'],
                                filename)
 
-@app.route('/uploads/cover/<filename>')
+@app.route('/cover/<filename>')
 def uploaded_file_cover(filename):
     return send_from_directory(app.config['UPLOAD_FOLDER_COVER'],
                                filename)
@@ -130,7 +140,7 @@ def scape():
 @app.route('/books_grid')
 def show_books_grid():
     books = db.session.query(Book).all() # or you could have used User.query.all()
-    return render_template('show_books_grid.html', books=books)
+    return render_template('show_books_grid.html', books=books, light=light)
 
 @app.route('/books/<int:id>')
 def show_book_by_id(id):
@@ -154,12 +164,13 @@ def show_book_by_id(id):
         db.session.add(user_info)
         db.session.commit()
     if not book:
-        return render_template('red_link.html', id=id)
+        return render_template('red_link.html', id=id, light=light)
     else:
-        return render_template('show_book_detail.html', book=book, previousbook = previousbook, nextbook = nextbook, all_instances=all_instances)
+        return render_template('show_book_detail.html', book=book, previousbook = previousbook, nextbook = nextbook, all_instances=all_instances, light=light)
 
 
 @app.route('/books/<int:id>/delete', methods=['POST', 'GET'])
+@check_light
 def remove_book_by_id(id):
     book_to_edit = Book.query.filter_by(id=id).first()
     title = book_to_edit.title
@@ -170,6 +181,7 @@ def remove_book_by_id(id):
     return redirect(url_for('show_books'))
 
 @app.route('/books/<int:id>/edit', methods=['POST', 'GET'])
+@check_light
 def edit_book_by_id(id):
     book_to_edit = Book.query.filter_by(id=id).first()
     user_form = EditForm(title = book_to_edit.title, author =book_to_edit.authors, category = book_to_edit.category, year_published= book_to_edit.year_published, message= book_to_edit.message, sameness=book_to_edit.sameness, gender=book_to_edit.gender, diversity=book_to_edit.diversity, who=book_to_edit.who)
@@ -238,10 +250,11 @@ def edit_book_by_id(id):
             flash("%s updated" % (title))
             return redirect(url_for('show_book_by_id', id=id))
 
-    return render_template('edit_book_detail.html', book=book_to_edit, form=user_form)
+    return render_template('edit_book_detail.html', book=book_to_edit, form=user_form, light=light)
 
 
 @app.route('/add-book', methods=['POST', 'GET'])
+@check_light
 def add_book():
     upload_form = UploadForm()
     allbooks = db.session.query(Book).all()
@@ -338,7 +351,7 @@ def add_book():
             return redirect(url_for('show_books'))
 
     flash_errors(upload_form)
-    return render_template('add_book.html', form=upload_form, books_all=books_all, authors_all=authors_all, categories=categories, stacks_all=stacks_all, books_potential=books_potential, earliest=earliest, latest=latest)
+    return render_template('add_book.html', form=upload_form, books_all=books_all, authors_all=authors_all, categories=categories, stacks_all=stacks_all, books_potential=books_potential, earliest=earliest, latest=latest, light=light)
 
 
 # Flash errors from the form if validation fails
@@ -358,10 +371,11 @@ def show_author_by_id(id):
     if not author:
         abort (404)
     else:
-        return render_template('show_author_detail.html', author=author)
+        return render_template('show_author_detail.html', author=author, light=light)
 
 
 @app.route('/authors/<int:id>/edit', methods=['POST', 'GET'])
+@check_light
 def edit_author_by_id(id):
     return "Ask the programmer."
 
@@ -370,9 +384,10 @@ def edit_author_by_id(id):
 @app.route('/stacks')
 def show_stacks():
     stacks = db.session.query(Stack).all()
-    return render_template('show_stacks.html', stacks=stacks)
+    return render_template('show_stacks.html', stacks=stacks, light=light)
 
 @app.route('/stacks/add_stack', methods=['POST', 'GET'])
+@check_light
 def add_stack():
     form = StackForm()
     stacks = db.session.query(Stack).all()
@@ -388,7 +403,7 @@ def add_stack():
         stacks = db.session.query(Stack).all()
         return redirect(url_for('show_stacks'))
         flash("%s stack created" % (stack_name))
-    return render_template('add_stack.html', stacks=stacks, form=form)
+    return render_template('add_stack.html', stacks=stacks, form=form, light=light)
 
 @app.route('/stacks/tab/<int:id>', methods=['POST', 'GET'])
 def show_stack_in_tab(id):
@@ -400,20 +415,22 @@ def show_stack_by_id(id, is_tab=False):
 
     stack = Stack.query.get(id)
     if not stack:
-        return render_template('add_stack.html', stacks=stacks, form=form)
+        return render_template('add_stack.html', stacks=stacks, form=form, light=light)
     else:
         if is_tab == False:
-            return render_template('show_stack_detail.html', stack=stack)
+            return render_template('show_stack_detail.html', stack=stack, light=light)
         else:
-            return render_template('show_stack_detail_tab.html', stack=stack)
+            return render_template('show_stack_detail_tab.html', stack=stack, light=light)
 
 @app.route('/stacks/<int:id>/delete', methods=['POST', 'GET'])
+@check_light
 def remove_stack_by_id(id):
     Stack.query.filter_by(id=id).delete()
     db.session.commit()
     return redirect(url_for('show_stacks'))
 
 @app.route('/stacks/<int:id>/edit', methods=['POST', 'GET'])
+@check_light
 def edit_stack_by_id(id):
     stack = Stack.query.filter_by(id=id).first()
     form = EditStackForm(edit_stack_name = stack.stack_name, edit_stack_description = stack.stack_description)
@@ -426,9 +443,10 @@ def edit_stack_by_id(id):
         stack.stack_description = stack_description
         db.session.commit()
         return redirect(url_for('show_stack_by_id', id=id))
-    return render_template('edit_stack_detail.html', stack=stack, form=form)
+    return render_template('edit_stack_detail.html', stack=stack, form=form, light=light)
 
 @app.route('/instances', methods=['POST', 'GET'])
+@check_light
 def show_instances():
     all_instances = db.session.query(Instance).all()
     instances = []
@@ -457,17 +475,18 @@ def show_instances():
         print(oldname)
         print(name)
         db.session.commit()
-    return render_template('show_instances.html', instances=instances)
+    return render_template('show_instances.html', instances=instances, light=light)
 
 @app.route('/stacks/<int:stackid>/remove/<int:bookid>', methods=['POST', 'GET'])
+@check_light
 def remove_from_stack(bookid, stackid):
     book = Book.query.get(bookid)
     stack = Stack.query.get(stackid)
     if book not in stack.books:
-        return render_template('show_book_detail.html', book=book)
+        return render_template('show_book_detail.html', book=book, light=light)
     stack.books.remove(book)
     db.session.commit()
-    return render_template('show_book_detail.html', book=book)
+    return render_template('show_book_detail.html', book=book, light=light)
 
 ## search
 view = ['1']
@@ -482,12 +501,12 @@ def show_books():
     if search.grid.data:
         viewby = '2'
         view.append('2')
-        return render_template ('show_books_grid.html', books=books, form=search)
+        return render_template ('show_books_grid.html', books=books, form=search, light=light)
 
     if search.listview.data:
         viewby = '1'
         view.append('1')
-        return render_template ('show_books.html', books=books, form=search)
+        return render_template ('show_books.html', books=books, form=search, light=light)
 
     if request.method == 'POST':
         newmsg = 'searched for: ' + search.search.data
@@ -504,7 +523,7 @@ def show_books():
             db.session.rollback()
         return redirect((url_for('search_results', searchtype=search.select.data, query=search.search.data, viewby=viewby)))
 
-    return render_template('show_books.html', books=books, form=search)
+    return render_template('show_books.html', books=books, form=search, light=light)
 
 @app.route('/search/<searchtype>/<viewby>/<query>', methods=['POST', 'GET'])
 def search_results(searchtype, query, viewby):
@@ -539,7 +558,7 @@ def search_results(searchtype, query, viewby):
     if results.count() == 0:
         books = Book.query.filter(Book.file.like('potential.pdf'))
         upload_form = UploadForm(title= query, author='')
-        return render_template('red_link.html', form=upload_form, title=query, books=books)
+        return render_template('red_link.html', form=upload_form, title=query, books=books, light=light)
 
     count = results.count()
     whole = Book.query.count()
@@ -549,11 +568,11 @@ def search_results(searchtype, query, viewby):
 
     if search.listview.data:
         view.append('1')
-        return render_template('results.html', books=results, form=search, query=query, books_all=books_all, searchtype=search.select.data, count = count, whole = whole, percentage = percentage)
+        return render_template('results.html', books=results, form=search, query=query, books_all=books_all, searchtype=search.select.data, count = count, whole = whole, percentage = percentage, light=light)
 
     if search.grid.data:
         view.append('2')
-        return render_template('results_grid.html', books=results, form=search, query=query, books_all=books_all, searchtype=search.select.data, count = count, whole = whole, percentage = percentage)
+        return render_template('results_grid.html', books=results, form=search, query=query, books_all=books_all, searchtype=search.select.data, count = count, whole = whole, percentage = percentage, light=light)
 
     if request.method == 'POST':
         newmsg = 'searched for: ' + search.search.data
@@ -578,10 +597,10 @@ def search_results(searchtype, query, viewby):
             return redirect((url_for('search_results', searchtype=search.select.data, query=search.search.data, viewby=viewby)))
 
     if viewby == '2':
-        return render_template('results_grid.html', form=search, books=results, books_all=books_all, searchtype=search.select.data, query=query, count = count, whole = whole, percentage = percentage)
+        return render_template('results_grid.html', form=search, books=results, books_all=books_all, searchtype=search.select.data, query=query, count = count, whole = whole, percentage = percentage, light=light)
 
     else:
-        return render_template('results.html', form=search, books=results, books_all=books_all, searchtype=search.select.data, query=query, count = count, whole = whole, percentage = percentage)
+        return render_template('results.html', form=search, books=results, books_all=books_all, searchtype=search.select.data, query=query, count = count, whole = whole, percentage = percentage, light=light)
 
 
 # ## Search - autocomplete
@@ -611,22 +630,24 @@ def search_results(searchtype, query, viewby):
 ## STACKS!
 
 @app.route('/add_to_stack/<int:id>', methods=['GET', 'POST'])
+@check_light
 def add_to_stack(id):
     stacks = db.session.query(Stack).all()
     add_form = AddtoStackForm(request.form)
     add_form.select_stack.choices = [(stack.id, stack.stack_name) for stack in stacks]
     if request.method == 'GET':
         book = Book.query.get(id)
-        return render_template('add_to_stacks.html', id=id, stacks=stacks, book=book, add_form=add_form)
+        return render_template('add_to_stacks.html', id=id, stacks=stacks, book=book, add_form=add_form, light=light)
     else:
         stack = Stack.query.get(int(add_form.select_stack.data))
         book = Book.query.get(id)
         stack.books.append(book)
         db.session.commit()
-        return render_template('show_stack_detail.html', stack=stack)
+        return render_template('show_stack_detail.html', stack=stack, light=light)
 
 
 @app.route('/export/csv', methods=['GET'])
+@check_light
 def export_csv():
     output = io.StringIO()
     #fieldnames = ['title', 'authors', 'file', 'fileformat', 'category', 'year_published', 'description' ]
@@ -662,6 +683,7 @@ def export_csv():
 
 import codecs
 @app.route('/import/csv', methods= ['POST','GET'])
+@check_light
 def import_csv():
     if request.method == 'POST':
         if 'file' not in request.files:
@@ -719,10 +741,11 @@ def import_csv():
                                 db.session.add(a)
                             book.authors.append(a)
             db.session.commit()
-    return render_template('import_csv.html', numberadded=numberadded)
+    return render_template('import_csv.html', numberadded=numberadded, light=light)
 
 
-@app.route('/empty_catalogue487352698237465', methods= ['POST','GET'])
+@app.route('/emptycataloguexpubxpubfuck', methods= ['POST','GET'])
+@check_light
 def empty_catalogue():
     meta = db.metadata
     for table in reversed(meta.sorted_tables):
@@ -766,12 +789,6 @@ def get_chat():
 # The functions below should be applicable to all Flask apps.
 ###
 
-@app.route('/<file_name>.txt')
-def send_text_file(file_name):
-    """Send your static text file."""
-    file_dot_text = file_name + '.txt'
-    return app.send_static_file(file_dot_text)
-
 
 @app.after_request
 def add_header(response):
@@ -780,14 +797,14 @@ def add_header(response):
     and also to cache the rendered page for 10 minutes.
     """
     response.headers['X-UA-Compatible'] = 'IE=Edge,chrome=1'
-    response.headers['Cache-Control'] = 'public, max-age=600'
+    response.headers['Cache-Control'] = 'no-cache'
     return response
 
 
 @app.errorhandler(404)
 def page_not_found(error):
     """Custom 404 page."""
-    return render_template('404.html'), 404
+    return render_template('404.html', light=light), 404
 
 
 ### SOCKET for the chat