diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
new file mode 100644
index 0000000..69a7575
--- /dev/null
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1,40 @@
+# Contribute To TMS Sara Hilden Theme
+
+Community-made patches, localisations, bug reports and contributions are welcome and help make TMS Sara Hilden Theme even better!
+
+When contributing please ensure you follow the guidelines below so that we can keep on top of things.
+
+## Getting Started
+
+- Submit a ticket for your issue, assuming one does not already exist.
+- Raise it on our Issue Tracker.
+- Clearly describe the issue including steps to reproduce the bug.
+- Make sure you fill in the earliest version that you know has the issue as well as the version of WordPress you're using.
+
+## Making Changes
+
+- Fork the repository on GitHub.
+- Make the changes to your forked repository.
+- Add unit / integration tests where necessary.
+- Ensure you stick to the [Geniem Oy WordPress Coding Standards][wpcs] and have properly documented any new functions.
+- When committing, reference your issue (if present) and include a note about the fix.
+- Push the changes to your fork and submit a pull request to the 'develop' branch of the ... repository.
+
+### Checking Your Changes
+
+- Run code standards: `composer lint-all`
+- Automatically fix (most) lint errors: `composer lint-fix`
+
+## Code Documentation
+
+- Please make sure that every method is documented well, and the documentation follows the standards.
+
+At this point you're waiting on us to merge your pull request. We'll review all pull requests, and make suggestions and changes if necessary.
+
+# Additional Resources
+- [General GitHub Documentation][gh-help]
+- [GitHub Pull Request documentation][gh-pr]
+
+[gh-pr]: http://help.github.com/send-pull-requests/
+[gh-help]: https://help.github.com/
+[wpcs]: https://github.com/devgeniem/geniem-rules-codesniffer
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..caf1ec4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+## Describe the bug
+<!-- A clear and concise description of what the bug is. -->
+
+## To Reproduce
+<!-- Steps to reproduce the behaviour:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error -->
+
+## Expected behaviour
+<!-- A clear and concise description of what you expected to happen. -->
+
+## Screenshots
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+## Environment
+
+<!-- OS, browser, browser version, PHP version, WordPress version, active plugins, active theme, etc. -->
+
+## Additional context
+<!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 0000000..8ffb702
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+## Is your feature request related to a problem?
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+## Describe the solution you'd like
+<!-- A clear and concise description of what you want to happen. -->
+
+## Describe alternatives you've considered
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+## Additional context
+<!-- Add any other context or screenshots about the feature request here. -->
diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md
new file mode 100644
index 0000000..eddc667
--- /dev/null
+++ b/.github/SUPPORT.md
@@ -0,0 +1,3 @@
+# Support for TMS Vapriikki Theme
+
+The best place to get support for this project is on the Issue Tracker.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..35318a5
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,31 @@
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "composer" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+    # Prefix all commit messages with "Composer"
+    # include a list of updated dependencies
+    commit-message:
+      prefix: "Composer"
+      include: "scope"
+    # Specify labels for Composer pull requests
+    labels:
+      - "maintenance"
+      - "maintenance-composer"
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    # Prefix all commit messages with "NPM"
+    # include a list of updated dependencies
+    commit-message:
+      prefix: "NPM"
+      include: "scope"
+    # Specify labels for NPM pull requests
+    labels:
+      - "maintenance"
+      - "maintenance-npm"
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 5b55672..5125b6d 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,4 +1,6 @@
-Task: https://hiondigital.atlassian.net/browse/TMS-949
+Severa-ID: 2108
+Severa-kuvaus: 
+Task: https://hiondigital.atlassian.net/browse/TMS-
 
 <!--- Provide a general summary of your changes in the Title above -->
 
diff --git a/.github/workflows/phpcs-check.yml b/.github/workflows/phpcs-check.yml
new file mode 100644
index 0000000..537e219
--- /dev/null
+++ b/.github/workflows/phpcs-check.yml
@@ -0,0 +1,37 @@
+name: PHP CS Checks
+
+on: [push]
+
+jobs:
+  phpcs-check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+
+      - name: Cache Composer packages
+        id: composer-cache
+        uses: actions/cache@v2
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          extensions: simplexml
+          coverage: xdebug
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run PHPCS Check
+        run: |
+          composer install --prefer-dist --no-progress
+          composer require staabm/annotate-pull-request-from-checkstyle
+          ./vendor/bin/phpcs -q --report=checkstyle | vendor/bin/cs2pr --graceful-warnings
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 8e16f6b..2cfb949 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [1.2.0] - 2023-11-21
 
 - TMS-974: Recurring event layout changes
+- TMS-935: Archive filter accessibility fixes
 
 ## [1.1.4] - 2023-10-23
 
diff --git a/assets/styles/ui-components/_archive-filters.scss b/assets/styles/ui-components/_archive-filters.scss
index fbbf31f..e977161 100644
--- a/assets/styles/ui-components/_archive-filters.scss
+++ b/assets/styles/ui-components/_archive-filters.scss
@@ -63,7 +63,7 @@
 .archive-filters {
     &__select-container {
         display: flex;
-        flex-direction: column;
+        flex-direction: column-reverse;
         gap: $theme-spacing-oneandhalf;
 
         @include until($tablet) {
@@ -71,11 +71,16 @@
         }
 
         @include from($tablet) {
-            flex-direction: row;
+            flex-direction: unset;
+            flex-wrap: wrap-reverse;
         }
 
         select {
             width: 100%;
         }
     }
+
+    &__description {
+        width: 100%;
+    }
 }
\ No newline at end of file
diff --git a/partials/views/home/home-filters.dust b/partials/views/home/home-filters.dust
index ece678a..aab3f18 100644
--- a/partials/views/home/home-filters.dust
+++ b/partials/views/home/home-filters.dust
@@ -1,19 +1,19 @@
 <div class="archive-filters columns mt-6">
-    <div class="column is-8">
+    <div class="column is-8" aria-labelledby="filter">
         {?filters.categories}
-            <div class="h6 mb-4">
-                {Strings.s.home.filter_by_category|s}
+            <div class="h6 mb-4" id="filter">
+                {Strings.s.home.filter_by_category|html}
             </div>
 
             <div>
                 {#filters.categories}
-                    <a href="{url}"
-                    class="pill mr-2 mb-2 {?is_active}is-primary-invert{/is_active}">
+                    <a href="{url|url}"
+                    class="pill mr-2 mb-2 {?is_active}is-primary-invert{/is_active}" {?is_active}aria-current="true"{/is_active}>
                         {?is_active}
                             {>"ui/icon" icon="checkmark" class="icon--medium mr-2 is-primary-invert" /}
                         {/is_active}
 
-                        {name|s}
+                        {name|html}
                     </a>
                 {/filters.categories}
             </div>
@@ -23,22 +23,27 @@
     <div class="column is-4">
         <form action="" method="get" class="is-flex is-justify-content-flex-end archive-filters__form">
             {?filters.active_category}
-                <input name="filter-category" type="hidden" value="{filters.active_category|s}">
+                <input name="filter-category" type="hidden" value="{filters.active_category|attr}">
             {/filters.active_category}
 
-            <div class="archive-filters__select-container">
+            <div class="archive-filters__select-container" aria-describedby="archive-filters-description">
+
+                <p class="archive-filters__description" id="archive-filters-description">
+                    {Strings.s.home.description|html}
+                </p>
+
                 <div class="archive-filters__dropdown-item">
                     <label for="filter-year" class="is-block h6 mb-4">
-                        {Strings.s.home.year|s}
+                        {Strings.s.home.year|html}
                     </label>
 
                     <select name="filter-year" id="filter-year"
                             class="js-trigger-form-submit p-2 has-background-invert has-border-radius-small has-border-gray has-border-1">
-                        <option value="">{Strings.s.common.all|s}</option>
+                        <option value="">{Strings.s.common.all|html}</option>
 
                         {#filters.years}
-                            <option value="{key}" {is_selected|s}>
-                                {name|s}
+                            <option value="{key|attr}" {is_selected|attr}>
+                                {name|html}
                             </option>
                         {/filters.years}
                     </select>
@@ -46,15 +51,15 @@
 
                 <div class="archive-filters__dropdown-item">
                     <label for="filter-month" class="is-block h6 mb-4">
-                        {Strings.s.home.month|s}
+                        {Strings.s.home.month|html}
                     </label>
 
                     <select name="filter-month" id="filter-month"
                             class="js-trigger-form-submit p-2 has-border-radius-small has-border-gray has-border-1">
-                        <option value="">{Strings.s.common.all|s}</option>
+                        <option value="">{Strings.s.common.all|html}</option>
                         {#filters.months}
-                            <option value="{key}" {is_selected|s}>
-                                {name|s}
+                            <option value="{key|attr}" {is_selected|attr}>
+                                {name|html}
                             </option>
                         {/filters.months}
                     </select>