diff --git a/categories/templates/categories/_form.html b/categories/templates/categories/_form.html
index 513ed44..6d58e53 100644
--- a/categories/templates/categories/_form.html
+++ b/categories/templates/categories/_form.html
@@ -59,7 +59,7 @@
 		{% endif %}
 	{% endfor %}
 	<div class="row text-center">
-		<input type="submit" value="{% trans 'Save' %}" class="btn btn-primary btn-raised" />
+		<input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised" />
 	</div>
 </form>
 
diff --git a/categories/templates/categories/delete.html b/categories/templates/categories/delete.html
index 90e2000..38fe80e 100644
--- a/categories/templates/categories/delete.html
+++ b/categories/templates/categories/delete.html
@@ -16,7 +16,7 @@
       <div id="delete-category-footer"class="modal-footer">
         <!-- Don't remove that!!!  -->
         <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
-        <button type="submit" id="button" form="delete_form" class="btn btn-primary btn-raised erase-button">{% trans "Delete" %}</button>
+        <button type="submit" id="button" form="delete_form" class="btn btn-success btn-raised erase-button">{% trans "Delete" %}</button>
         {% if index %}
         <script>
           $("#delete_form").submit(function(event) {
diff --git a/categories/templates/categories/list.html b/categories/templates/categories/list.html
index 467f82a..f22235c 100755
--- a/categories/templates/categories/list.html
+++ b/categories/templates/categories/list.html
@@ -26,7 +26,11 @@
     {% endif %}
 
     {% if user.is_staff %}
-        <a href="{% url 'categories:create' %}"><button id="create-category"> {% trans "Create Category" %}</button></a>
+        <div class='row'>
+            <div class="col-md-offset-3 col-md-6">
+                <a href="{% url 'categories:create' %}" class="btn btn-raised btn-success btn-block">{% trans "Create Category" %}</a>
+            </div>
+        </div>
     {% endif %}
 
     {% if not user.is_staff %}
diff --git a/mailsender/templates/mailsender/update.html b/mailsender/templates/mailsender/update.html
index cff41ba..e52288b 100644
--- a/mailsender/templates/mailsender/update.html
+++ b/mailsender/templates/mailsender/update.html
@@ -56,7 +56,7 @@
 					{% endfor %}
 					<div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
 						<div class="text-center">
-							<input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-primary" />
+							<input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
 						</div>
 					</div>
 				</form>
diff --git a/security/templates/security/update.html b/security/templates/security/update.html
index f05b6ca..2f22833 100644
--- a/security/templates/security/update.html
+++ b/security/templates/security/update.html
@@ -39,7 +39,7 @@
 					{% endfor %}
 					<div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
 						<div class="text-center">
-							<input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-primary" />
+							<input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
 						</div>
 					</div>
 				</form>
diff --git a/subjects/templates/subjects/_form.html b/subjects/templates/subjects/_form.html
index 073d599..f55af55 100644
--- a/subjects/templates/subjects/_form.html
+++ b/subjects/templates/subjects/_form.html
@@ -84,7 +84,7 @@
 		{% endif %}
 	{% endfor %}
 	<div class="row text-center">
-		<input type="submit" value="{% trans 'Save' %}" class="btn btn-primary btn-raised" />
+		<input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised" />
 	</div>
 </form>
 
diff --git a/subjects/templates/subjects/delete.html b/subjects/templates/subjects/delete.html
index acb30df..496d18d 100644
--- a/subjects/templates/subjects/delete.html
+++ b/subjects/templates/subjects/delete.html
@@ -21,7 +21,7 @@
       <div class="modal-footer">
         <!-- Don't remove that!!!  -->
         <button type="button" class="btn btn-raised btn-default" data-dismiss="modal">{% trans "Close" %}</button>
-        <button type="submit" id="button" form="delete_form" class="btn btn-primary btn-raised">{% trans "Delete" %}</button>
+        <button type="submit" id="button" form="delete_form" class="btn btn-success btn-raised">{% trans "Delete" %}</button>
 
         {% if index %}
         <script>
diff --git a/subjects/templates/subjects/list.html b/subjects/templates/subjects/list.html
index e702943..5c40a13 100644
--- a/subjects/templates/subjects/list.html
+++ b/subjects/templates/subjects/list.html
@@ -101,7 +101,7 @@
                                 {{category.description|safe}}
                             
                                 {% if request.user in category.coordinators.all or request.user.is_staff %}
-                                    <a href="{% url 'subjects:create' category.slug %}"><button class="create-subject-btn"> {% trans "Create new subject" %} </button></a>
+                                    <a href="{% url 'subjects:create' category.slug %}" class="btn btn-raised btn-success btn-block btn-sm">{% trans "Create new subject" %}</a>
                                 {% endif %}
                                 
                                 <div class="panel-group subject-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
@@ -164,9 +164,9 @@
                                 {% endif %}
                                
                                 {{category.description|safe}}
-                            
+                                
                                 {% if request.user in category.coordinators.all or request.user.is_staff %}
-                                    <a href="{% url 'subjects:create' category.slug %}"><button class="create-subject-btn"> {% trans "Create new subject" %} </button></a>
+                                    <a href="{% url 'subjects:create' category.slug %}" class="btn btn-raised btn-success btn-block btn-sm">{% trans "Create new subject" %}</a>
                                 {% endif %}
 
                                 <div class="panel-group subject-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
diff --git a/subjects/templates/subjects/view.html b/subjects/templates/subjects/view.html
index 774f15a..3cd0c24 100644
--- a/subjects/templates/subjects/view.html
+++ b/subjects/templates/subjects/view.html
@@ -79,7 +79,7 @@
             <p>{{subject.description|safe}}</p>
 
             {% if request.user in subject.professor.all or request.user in subject.category.coordinators.all or request.user.is_staff %}
-                <a href="{% url 'topics:create' subject.slug %}"><button class="btn btn-sm btn-primary btn-raised btn-block"> {% trans "Create new topic" %} </button></a>
+                <a href="{% url 'topics:create' subject.slug %}" class="btn btn-sm btn-success btn-raised btn-block">{% trans "Create new topic" %}</a>
             {% endif %}
             
         </div>
diff --git a/themes/templates/themes/basic_update.html b/themes/templates/themes/basic_update.html
index 5f07ad8..9abe7f2 100644
--- a/themes/templates/themes/basic_update.html
+++ b/themes/templates/themes/basic_update.html
@@ -86,7 +86,7 @@
 					{% endfor %}
 					<div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
 						<div class="text-center">
-							<input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-primary" />
+							<input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
 						</div>
 					</div>
 				</form>
diff --git a/themes/templates/themes/css_update.html b/themes/templates/themes/css_update.html
index b00b679..d151be4 100644
--- a/themes/templates/themes/css_update.html
+++ b/themes/templates/themes/css_update.html
@@ -66,7 +66,7 @@
 					{% endfor %}
 					<div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
 						<div class="text-center">
-							<input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-primary" />
+							<input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
 						</div>
 					</div>
 				</form>
diff --git a/users/templates/users/_form.html b/users/templates/users/_form.html
index 41865e8..f544adb 100644
--- a/users/templates/users/_form.html
+++ b/users/templates/users/_form.html
@@ -58,7 +58,7 @@
 	{% endfor %}
 	<div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
 		<div class="pull-left">
-			<input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-primary" />
+			<input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
 		</div>
 		<div class="pull-right">
 			<a href="{% url back_url %}" class="btn btn-raised btn-default">{% trans 'Cancel' %}</a>
diff --git a/users/templates/users/delete.html b/users/templates/users/delete.html
index 30a5b92..2bfe62f 100644
--- a/users/templates/users/delete.html
+++ b/users/templates/users/delete.html
@@ -20,7 +20,7 @@
                     <div class="row">
                         <div class="col-md-12">
                             <div class="pull-left">
-                                <input type="submit" class="btn btn-raised btn-block btn-primary" value="{% trans 'Remove' %}" />
+                                <input type="submit" class="btn btn-raised btn-block btn-success" value="{% trans 'Remove' %}" />
                             </div>
                             <div class="pull-right">
                                 <a href="{% url 'users:manage' %}" class="btn btn-raised btn-block btn-default" >{% trans 'Cancel' %}</a>
diff --git a/users/templates/users/delete_account.html b/users/templates/users/delete_account.html
index 4ebf986..5d0e621 100644
--- a/users/templates/users/delete_account.html
+++ b/users/templates/users/delete_account.html
@@ -20,7 +20,7 @@
                     <div class="row">
                         <div class="col-md-12">
                             <div class="pull-left">
-                                <input type="submit" class="btn btn-raised btn-block btn-primary" value="{% trans 'Remove' %}" />
+                                <input type="submit" class="btn btn-raised btn-block btn-success" value="{% trans 'Remove' %}" />
                             </div>
                             <div class="pull-right">
                                 <a href="{% url 'users:profile' %}" class="btn btn-raised btn-block btn-default" >{% trans 'Cancel' %}</a>
diff --git a/users/templates/users/list.html b/users/templates/users/list.html
index e903926..e2a2b52 100644
--- a/users/templates/users/list.html
+++ b/users/templates/users/list.html
@@ -38,7 +38,7 @@
             </form>
         </div>
         <div class="col-md-3">
-            <a href="{% url 'users:create' %}" class="pull-right btn btn-primary btn-raised btn-md"><i class="fa fa-plus"></i> {% trans 'Create User' %}</a>
+            <a href="{% url 'users:create' %}" class="pull-right btn btn-success btn-raised btn-md"><i class="fa fa-plus"></i> {% trans 'Create User' %}</a>
         </div>
     </div>
 
@@ -62,7 +62,7 @@
                     </div>
                     <div class="col-md-3">
                         <div align="right">
-                            <a href="{% url 'users:update' acc.email %}" class="btn btn-primary btn-raised btn-sm"><i class="fa fa-edit"></i> {% trans 'Edit' %}</a>
+                            <a href="{% url 'users:update' acc.email %}" class="btn btn-success btn-raised btn-sm"><i class="fa fa-edit"></i> {% trans 'Edit' %}</a>
                             <a href="{% url 'users:delete' acc.email %}" class="btn btn-default btn-raised btn-sm"><i class="fa fa-trash"></i> {% trans 'Delete' %}</a>
                         </div>
                     </div>
diff --git a/users/templates/users/register.html b/users/templates/users/register.html
index 823fb18..f0f10f2 100644
--- a/users/templates/users/register.html
+++ b/users/templates/users/register.html
@@ -87,7 +87,7 @@
 						<div class="row">
 							<div class="col-lg-12 col-md-12 col-sm-12">
 								<div class="pull-left">
-									<input type="submit" value="{% trans 'Register' %}" class="btn btn-raised btn-primary" />
+									<input type="submit" value="{% trans 'Register' %}" class="btn btn-raised btn-success" />
 								</div>
 								<div class="pull-right">
 									<a href="{% url 'users:login' %}" class="btn btn-raised btn-default"> {% trans 'Back' %}</a>
--
libgit2 0.21.2