diff --git a/base/announcement/announcement_form.html b/base/announcement/announcement_form.html
new file mode 100644
index 0000000..f94a275
--- /dev/null
+++ b/base/announcement/announcement_form.html
@@ -0,0 +1,38 @@
+{% load i18n %}
+{% if messages %}
+
+
+{% endif %}
+{% if form.errors %}
+
diff --git a/base/announcement/announcement_one.html b/base/announcement/announcement_one.html
new file mode 100644
index 0000000..0af6bc0
--- /dev/null
+++ b/base/announcement/announcement_one.html
@@ -0,0 +1,168 @@
+{% load i18n %}
+{% load static %}
+{% load basefilters %}
+{% if messages %}
+
+
+ {% if instance_ids %}
+
+
+
+
+
+ {% endif %}
+ {% if announcement %}
+
+ {% if perms.base.change_announcement or perms.base.delete_announcement %}
+
+
+
+
+ {% endif %}
+
+
+
{{ announcement.description|safe }}
+
+
+
+
+ {% if announcement.department.all %}
+
+
{% trans "Department" %}
+
+ {% for dep in announcement.department.all %}
+ #{{ dep.department }}
+ {% endfor %}
+
+
+ {% endif %}
+ {% if announcement.job_position.all %}
+
+
{% trans "Job Position" %}
+
+ {% for job in announcement.job_position.all %}
+ #{{ job.job_position }}
+ {% endfor %}
+
+
+ {% endif %}
+
+
+ {% else %}
+
+

+
{% trans "No Records found." %}
+
{% trans "There are no announcements at the moment." %}
+
+ {% endif %}
+
+
+
+
diff --git a/base/announcement/announcement_update_form.html b/base/announcement/announcement_update_form.html
new file mode 100644
index 0000000..38110f0
--- /dev/null
+++ b/base/announcement/announcement_update_form.html
@@ -0,0 +1,41 @@
+{% load i18n %}
+{% if messages %}
+
+
diff --git a/base/announcement/announcements_list.html b/base/announcement/announcements_list.html
new file mode 100644
index 0000000..b093a1c
--- /dev/null
+++ b/base/announcement/announcements_list.html
@@ -0,0 +1,41 @@
+{% load static %}
+{% load i18n %}
+{% if not announcements %}
+
+
{{ form.non_field_errors }}
+ {% for field in form.visible_fields %}
+ {% if field.field.widget.input_type != "checkbox" %}
+
+
+
+ {% if field.help_text %}
+
+ {% endif %}
+
+ {{ field|add_class:"form-control" }}
+ {{ field.errors }}
+
+ {% if field.name == "attachments" and field.field.widget.input_type == "file" and field.field.widget.attrs.multiple %}
+ {% if form.instance.pk %}
+
+ {% for file in form.instance.attachments.all %}
+
+
+
+
+
+ {% endfor %}
+
+ {% endif %}
+ {% endif %}
+
+ {% endif %}
+ {% endfor %}
+
+ {% for field in form.visible_fields %}
+ {% if field.field.widget.input_type == "checkbox" %}
+
+
+
+ {% if field.help_text %}
+
+ {% endif %}
+
+
+ {{ field|add_class:"oh-switch__checkbox" }}
+
+ {{ field.errors }}
+
+ {% endif %}
+ {% endfor %}
+
+
+ {# hidden fields #}
+ {% for hidden in form.hidden_fields %}
+ {{ hidden }}
+ {% endfor %}
+
diff --git a/base/announcement/comment_view.html b/base/announcement/comment_view.html
new file mode 100644
index 0000000..118b91e
--- /dev/null
+++ b/base/announcement/comment_view.html
@@ -0,0 +1,100 @@
+{% load basefilters static %}
+{% load i18n %}
+
+
+{% if messages %}
+