diff --git a/templates/set.html b/templates/set.html
index 38a277d..4023390 100644
--- a/templates/set.html
+++ b/templates/set.html
@@ -1,5 +1,7 @@
 {% extends 'base_main.html' %}
 
+{% load filters %}
+
 {% block title %}{{ set.name }}{% endblock %}
 
 {% block main %}
@@ -7,7 +9,9 @@
     <p>{{ set.description }}</p>
     <h4>Таски</h4>
     {% for settask in set.settasks_ordered %}
-        <a href="/task?setTask_id={{ settask.id }}">{{ settask.name }}. {{ settask.task.name }}</a><br>
+        {% with result=user|solved:settask.task %}
+            <a href="/task?setTask_id={{ settask.id }}" style="color: {% if result %}green{% else %}{% if result == False %}red{% else %}#307df6{% endif %}{% endif %};">{{ settask.name }}. {{ settask.task.name }}</a><br>
+        {% endwith %}
     {% endfor %}
     <hr><hr>
     Время начала: <b>{% if not set.start_time %}без ограничений{% else %}{{ set.start_time_moscow }}{% endif %}</b><br>
diff --git a/templates/set_settings.html b/templates/set_settings.html
index 6a02a25..f2b1f51 100644
--- a/templates/set_settings.html
+++ b/templates/set_settings.html
@@ -16,7 +16,7 @@
         <h3><input name="name" placeholder="Название" value="{{ set.name }}"></h3>
         <textarea id="input0" style="width: 1000px; height: 400px; resize: none;" name="description" placeholder="Описание">{{ set.description }}</textarea>
         <h4>Таски</h4>
-        {% for settask in settasks %}
+        {% for settask in set.settasks_ordered %}
             <input name="settask_{{ settask.id }}" style="width: 30px;" value="{{ settask.name }}"> {% if settask.task.creator == user or user.username in settask.task.editors %}<a href="/admin/task?task_id={{ settask.task.id }}">{{ settask.task.name }}</a>{% else %}{{ settask.task.name }}{% endif %}<br>
         {% endfor %}
         <button class="btn btn-light" type="submit" style="margin-top: 20px;"><i class="fa fa-save"></i> Установить</button>&emsp;<button type="button" class="btn btn-primary" style="margin-top: 20px;" data-toggle="modal" data-target="#example"><i class="fa fa-pencil"></i> Редактировать</button>
diff --git a/templates/task.html b/templates/task.html
index d09d4ef..277282b 100644
--- a/templates/task.html
+++ b/templates/task.html
@@ -1,5 +1,7 @@
 {% extends 'base_main.html' %}
 
+{% load filters %}
+
 {% block title %}{{ task.name }}{% endblock %}
 
 {% block scripts %}
@@ -114,7 +116,9 @@
     <div class="col-2">
         <h5><a href="/set?set_id={{ set.id }}">{{ set.name }}</a></h5>
         {% for settask in setTask.set.settasks_ordered %}
-            <a href="/task?setTask_id={{ settask.id }}">{% if task == settask.task %}<b>{% endif %}{{ settask.name }}. {{ settask.task.name }}{% if task == settask.task %}</b>{% endif %}</a><br>
+            {% with result=user|solved:settask.task %}
+                <a href="/task?setTask_id={{ settask.id }}" style="color: {% if result %}green{% else %}{% if result == False %}red{% else %}#307df6{% endif %}{% endif %};">{% if task == settask.task %}<b>{% endif %}{{ settask.name }}. {{ settask.task.name }}{% if task == settask.task %}</b>{% endif %}</a><br>
+            {% endwith %}
         {% endfor %}
     </div>
 {% endif %}
diff --git a/templates/tasks.html b/templates/tasks.html
index 959c6c4..f02b1e5 100644
--- a/templates/tasks.html
+++ b/templates/tasks.html
@@ -47,7 +47,7 @@
     </table>
     {% for task in user.userinfo.available_tasks %}
         {% with result=user|solved:task %}
-            <a href="/task?task_id={{ task.id }}" style="color: {% if result %}green{% else %}{% if result == False %}red{% else %}#307df6{% endif %}{% endif %};"">{{ task.name }}</a> {% if task.creator == user or user.username in task.editors %}<a href="/admin/task?task_id={{ task.id }}"><i class="fa fa-pencil"></i> </a><a href="/solutions?task_id={{ task.id }}"><i class="fa fa-stack-overflow"></i> </a>{% endif %}<br>
+            <a href="/task?task_id={{ task.id }}" style="color: {% if result %}green{% else %}{% if result == False %}red{% else %}#307df6{% endif %}{% endif %};">{{ task.name }}</a> {% if task.creator == user or user.username in task.editors %}<a href="/admin/task?task_id={{ task.id }}"><i class="fa fa-pencil"></i> </a><a href="/solutions?task_id={{ task.id }}"><i class="fa fa-stack-overflow"></i> </a>{% endif %}<br>
         {% endwith %}
     {% endfor %}
 {% endblock %}
\ No newline at end of file