diff --git a/src/js/lazily-loaded/Collapsible.js b/src/js/lazily-loaded/Collapsible.js
index 588f222..0612695 100644
--- a/src/js/lazily-loaded/Collapsible.js
+++ b/src/js/lazily-loaded/Collapsible.js
@@ -224,12 +224,12 @@ class Collapsible {
 
     if (event.target.playbackRate * (reverse ? 1 : -1) > 0) {
       this.node.classList.remove(this.constructor.classes.active)
-      this.node.setAttribute('aria-expanded', false)
+      this.trigger.setAttribute('aria-expanded', false)
       this.setStartState()
       return
     }
     this.node.classList.add(this.constructor.classes.active)
-    this.node.setAttribute('aria-expanded', true)
+    this.trigger.setAttribute('aria-expanded', true)
     this.setEndState()
   }
 
@@ -260,9 +260,11 @@ class Collapsible {
 
     if (this.initiallyOpen) {
       this.node.classList.add(this.constructor.classes.active)
-      this.node.setAttribute('aria-expanded', true)
+      this.trigger.setAttribute('aria-expanded', true)
       this.setEndState()
       return
+    } else {
+      this.trigger.setAttribute('aria-expanded', false)
     }
     this.setStartState()
   }
diff --git a/src/js/lazily-loaded/Tabs.js b/src/js/lazily-loaded/Tabs.js
index 304733c..6226960 100644
--- a/src/js/lazily-loaded/Tabs.js
+++ b/src/js/lazily-loaded/Tabs.js
@@ -10,6 +10,11 @@ class Tabs {
   removeAllActiveTabs(activeTabs) {
     for (let i = 0; i < activeTabs.length; i++) {
       const prevActiveTab = activeTabs[i]
+      if (prevActiveTab.classList.contains('tab-anchor')) {
+        prevActiveTab.setAttribute('aria-selected', 'false')
+      } else {
+        prevActiveTab.setAttribute('aria-hidden', 'true')
+      }
       prevActiveTab.classList.remove('activeTab')
     }
   }
@@ -23,11 +28,14 @@ class Tabs {
     this.removeAllActiveTabs(activeTabs)
 
     anchor.classList.add('activeTab')
+    anchor.setAttribute('aria-selected', 'true')
+
     const panelID = anchor.dataset.href
     const panel = parent.querySelector(
       `:scope > .tabs__content > [data-id="${panelID}"]`
     )
     panel.classList.add('activeTab')
+    panel.setAttribute('aria-hidden', 'false')
   }
 
   init() {
diff --git a/views/parts/_accordion.latte b/views/parts/_accordion.latte
index b0451bd..b77e301 100644
--- a/views/parts/_accordion.latte
+++ b/views/parts/_accordion.latte
@@ -6,6 +6,16 @@
 {varType bool $collapse_siblings} {* Whether or not opening one accordion items should close siblings. Default is falses *}
 {varType int $initially_open_item} {* By default all accordion items are closed. This can be used, and index passed to make one open by default *}
 
+
+
+{* panels ids - required for a11y purposes *}
+{var $panels_ids = []}
+{var $random_string = uniqid()}
+{foreach $items as $acc_index => $tab_content}
+  {var $index = $acc_index + 1}
+  {var $panels_ids[] = "{$random_string}_{$index}"}
+{/foreach}
+
 <div 
   class="accordion {$class ?? ''}"
   {if $collapse_siblings ?? false}
@@ -31,13 +41,18 @@
       <button
         class="collapsible__trigger"
         type="button"
+        id="acc_panel_{$panels_ids[$index]}"
         aria-label="{$aria_label_text}"
       >
         {block acc_trigger}{/block}
         <span class="chevron"></span>
       </button>
 
-      <div class="collapsible__content">
+      <div 
+        class="collapsible__content"
+        role="region"
+        aria-labelledby="acc_panel_{$panels_ids[$index]}"
+      >
         <div class="collapsible__content__inner">
           {block acc_content}{/block}
         </div>{* inner *}
diff --git a/views/parts/_collapsibles.latte b/views/parts/_collapsibles.latte
index 61a1b5e..978f768 100644
--- a/views/parts/_collapsibles.latte
+++ b/views/parts/_collapsibles.latte
@@ -72,7 +72,7 @@
     {/embed}
   </div>{* col *}
   <div class="col">
-    <h4>1 Level - independed</h4>
+    <h4>1 Level - independent</h4>
     {embed 
       tr_part('_accordion'), 
       items: $test_acc_items, 
diff --git a/views/parts/_tabs.latte b/views/parts/_tabs.latte
index 49562d7..810dd50 100644
--- a/views/parts/_tabs.latte
+++ b/views/parts/_tabs.latte
@@ -1,18 +1,34 @@
 {varType string $class} {* optional class to pass to the tabs element *}
 {varType array $tabs} {* $tabs array. Required. *}
 
+
+{* tabs ids - required for a11y purposes *}
+{var $tabs_ids = []}
+{var $random_string = uniqid()}
+{foreach $tabs as $tab_index => $tab_content}
+  {var $index = $tab_index + 1}
+  {var $tabs_ids[] = "{$random_string}_{$index}"}
+{/foreach}
+
 <div 
   class="tabs {$class ?? ''}"
   n:if="!empty($tabs)"
 >
 
-  <div class="tabs__nav">
+  <div 
+    class="tabs__nav"
+    role="tablist"
+  >
 
     <button 
       n:foreach="$tabs as $ta_key => $ta_content"
       type="button" 
-      class="tab-anchor {$ta_key == 0 ? 'activeTab' : ''}" 
       data-href="panel-{$ta_key}"
+      class="tab-anchor {$ta_key == 0 ? 'activeTab' : ''}"
+      id="tab_{$tabs_ids[$ta_key]}"
+      aria-selected="{$ta_key == 0 ? 'true' : 'false'}" 
+      aria-controls="panel-{$tabs_ids[$ta_key]}"
+      role="tab"
     >
       {block tab_anchor}{/block}
     </button>
@@ -24,7 +40,11 @@
     <div 
       class="tab-panel {$tp_key == 0 ? 'activeTab enter' : ''}" 
       data-id="panel-{$tp_key}"
+      id="panel-{$tabs_ids[$tp_key]}"
       n:foreach="$tabs as $tp_key => $tp_content"
+      aria-labelledby="tab_{$tabs_ids[$tp_key]}"
+      role="tabpanel"
+      aria-hidden="{$tp_key == 0 ? 'false' : 'true'}"
     >
       <div class="tab-panel__content">
         {block tab_panel}{/block}
diff --git a/views/temp/views-parts-_accordion.latte--0114b62ed0.php b/views/temp/views-parts-_accordion.latte--0114b62ed0.php
index a1e4d96..c855c24 100644
--- a/views/temp/views-parts-_accordion.latte--0114b62ed0.php
+++ b/views/temp/views-parts-_accordion.latte--0114b62ed0.php
@@ -13,23 +13,35 @@ final class Template0114b62ed0 extends Latte\Runtime\Template
 	public function main(): array
 	{
 		extract($this->params);
-		if (!empty($items)) /* line 9 */ {
+		echo '
+
+';
+		$panels_ids = [] /* line 12 */;
+		$random_string = uniqid() /* line 13 */;
+		$iterations = 0;
+		foreach ($items as $acc_index => $tab_content) /* line 14 */ {
+			$index = $acc_index + 1 /* line 15 */;
+			$panels_ids[] = "{$random_string}_{$index}" /* line 16 */;
+			$iterations++;
+		}
+		echo "\n";
+		if (!empty($items)) /* line 19 */ {
 			echo '<div 
   class="accordion ';
-			echo LR\Filters::escapeHtmlAttr($class ?? '') /* line 10 */;
+			echo LR\Filters::escapeHtmlAttr($class ?? '') /* line 20 */;
 			echo '"
 ';
-			if ($collapse_siblings ?? false) /* line 11 */ {
+			if ($collapse_siblings ?? false) /* line 21 */ {
 				echo '    data-collapse-siblings
 ';
 			}
 			echo '  data-duration="';
-			echo LR\Filters::escapeHtmlAttr(!empty($duration) ? $duration : '300') /* line 14 */;
+			echo LR\Filters::escapeHtmlAttr(!empty($duration) ? $duration : '300') /* line 24 */;
 			echo '"
 ';
-			if (!empty($easing)) /* line 16 */ {
+			if (!empty($easing)) /* line 26 */ {
 				echo '    data-easing="';
-				echo LR\Filters::escapeHtmlAttr($easing) /* line 17 */;
+				echo LR\Filters::escapeHtmlAttr($easing) /* line 27 */;
 				echo '"
 ';
 			}
@@ -37,14 +49,14 @@ class="accordion ';
 
 ';
 			$iterations = 0;
-			foreach ($iterator = $ʟ_it = new LR\CachingIterator($items, $ʟ_it ?? null) as $index => $item) /* line 21 */ {
-				$is_initially_open = isset($initially_open_item) && $index === $initially_open_item /* line 22 */;
-				$aria_label_text = !empty($aria_label) ? $aria_label : 'Toggle Accordion Item' /* line 23 */;
+			foreach ($iterator = $ʟ_it = new LR\CachingIterator($items, $ʟ_it ?? null) as $index => $item) /* line 31 */ {
+				$is_initially_open = isset($initially_open_item) && $index === $initially_open_item /* line 32 */;
+				$aria_label_text = !empty($aria_label) ? $aria_label : 'Toggle Accordion Item' /* line 33 */;
 				echo '  
     <div 
       class="collapsible"
 ';
-				if ($is_initially_open) /* line 27 */ {
+				if ($is_initially_open) /* line 37 */ {
 					echo '        data-initially-open
 ';
 				}
@@ -52,20 +64,29 @@ class="collapsible"
       <button
         class="collapsible__trigger"
         type="button"
+        id="acc_panel_';
+				echo LR\Filters::escapeHtmlAttr($panels_ids[$index]) /* line 44 */;
+				echo '"
         aria-label="';
-				echo LR\Filters::escapeHtmlAttr($aria_label_text) /* line 34 */;
+				echo LR\Filters::escapeHtmlAttr($aria_label_text) /* line 45 */;
 				echo '"
       >
         ';
-				$this->renderBlock('acc_trigger', get_defined_vars()) /* line 36 */;
+				$this->renderBlock('acc_trigger', get_defined_vars()) /* line 47 */;
 				echo '
         <span class="chevron"></span>
       </button>
 
-      <div class="collapsible__content">
+      <div 
+        class="collapsible__content"
+        role="region"
+        aria-labelledby="acc_panel_';
+				echo LR\Filters::escapeHtmlAttr($panels_ids[$index]) /* line 54 */;
+				echo '"
+      >
         <div class="collapsible__content__inner">
           ';
-				$this->renderBlock('acc_content', get_defined_vars()) /* line 42 */;
+				$this->renderBlock('acc_content', get_defined_vars()) /* line 57 */;
 				echo '
         </div>
       </div>
@@ -86,7 +107,7 @@ public function prepare(): void
 	{
 		extract($this->params);
 		if (!$this->getReferringTemplate() || $this->getReferenceType() === "extends") {
-			foreach (array_intersect_key(['index' => '21', 'item' => '21'], $this->params) as $ʟ_v => $ʟ_l) {
+			foreach (array_intersect_key(['acc_index' => '14', 'tab_content' => '14', 'index' => '31', 'item' => '31'], $this->params) as $ʟ_v => $ʟ_l) {
 				trigger_error("Variable \$$ʟ_v overwritten in foreach on line $ʟ_l");
 			}
 		}
@@ -94,14 +115,14 @@ public function prepare(): void
 	}
 
 
-	/** {block acc_trigger} on line 36 */
+	/** {block acc_trigger} on line 47 */
 	public function blockAcc_trigger(array $ʟ_args): void
 	{
 		
 	}
 
 
-	/** {block acc_content} on line 42 */
+	/** {block acc_content} on line 57 */
 	public function blockAcc_content(array $ʟ_args): void
 	{
 		
diff --git a/views/temp/views-parts-_collapsibles.latte--7b10b89549.php b/views/temp/views-parts-_collapsibles.latte--7b10b89549.php
index e54a6a6..9e4605f 100644
--- a/views/temp/views-parts-_collapsibles.latte--7b10b89549.php
+++ b/views/temp/views-parts-_collapsibles.latte--7b10b89549.php
@@ -92,7 +92,7 @@ class="f-row"
 		echo '
   </div>
   <div class="col">
-    <h4>1 Level - independed</h4>
+    <h4>1 Level - independent</h4>
 ';
 		$this->enterBlockLayer(3, get_defined_vars()) /* line 76 */;
 		if (false) {
@@ -325,7 +325,7 @@ class="f-row"
   style="--i-cols: 3; --i-gap: 15; margin-bottom: 200px;"
 >
   <div class="col">
-    <h5>Custom Easing:</h5>
+    <h5>Custom Easing</h5>
 ';
 		$this->enterBlockLayer(11, get_defined_vars()) /* line 358 */;
 		if (false) {
diff --git a/views/temp/views-parts-_tabs.latte--517e083405.php b/views/temp/views-parts-_tabs.latte--517e083405.php
index 5cd9d1e..a062188 100644
--- a/views/temp/views-parts-_tabs.latte--517e083405.php
+++ b/views/temp/views-parts-_tabs.latte--517e083405.php
@@ -13,29 +13,52 @@ final class Template517e083405 extends Latte\Runtime\Template
 	public function main(): array
 	{
 		extract($this->params);
-		if (!empty($tabs)) /* line 4 */ {
+		echo "\n";
+		$tabs_ids = [] /* line 6 */;
+		$random_string = uniqid() /* line 7 */;
+		$iterations = 0;
+		foreach ($tabs as $tab_index => $tab_content) /* line 8 */ {
+			$index = $tab_index + 1 /* line 9 */;
+			$tabs_ids[] = "{$random_string}_{$index}" /* line 10 */;
+			$iterations++;
+		}
+		echo "\n";
+		if (!empty($tabs)) /* line 13 */ {
 			echo '<div 
   class="tabs ';
-			echo LR\Filters::escapeHtmlAttr($class ?? '') /* line 5 */;
+			echo LR\Filters::escapeHtmlAttr($class ?? '') /* line 14 */;
 			echo '"
 >
 
-  <div class="tabs__nav">
+  <div 
+    class="tabs__nav"
+    role="tablist"
+  >
 
 ';
 			$iterations = 0;
-			foreach ($iterator = $ʟ_it = new LR\CachingIterator($tabs, $ʟ_it ?? null) as $ta_key => $ta_content) /* line 11 */ {
+			foreach ($iterator = $ʟ_it = new LR\CachingIterator($tabs, $ʟ_it ?? null) as $ta_key => $ta_content) /* line 23 */ {
 				echo '    <button
       type="button" 
+      data-href="panel-';
+				echo LR\Filters::escapeHtmlAttr($ta_key) /* line 26 */;
+				echo '"
       class="tab-anchor ';
-				echo LR\Filters::escapeHtmlAttr($ta_key == 0 ? 'activeTab' : '') /* line 14 */;
+				echo LR\Filters::escapeHtmlAttr($ta_key == 0 ? 'activeTab' : '') /* line 27 */;
+				echo '"
+      id="tab_';
+				echo LR\Filters::escapeHtmlAttr($tabs_ids[$ta_key]) /* line 28 */;
+				echo '"
+      aria-selected="';
+				echo LR\Filters::escapeHtmlAttr($ta_key == 0 ? 'true' : 'false') /* line 29 */;
 				echo '" 
-      data-href="panel-';
-				echo LR\Filters::escapeHtmlAttr($ta_key) /* line 15 */;
+      aria-controls="panel-';
+				echo LR\Filters::escapeHtmlAttr($tabs_ids[$ta_key]) /* line 30 */;
 				echo '"
+      role="tab"
     >
       ';
-				$this->renderBlock('tab_anchor', get_defined_vars()) /* line 17 */;
+				$this->renderBlock('tab_anchor', get_defined_vars()) /* line 33 */;
 				echo '
     </button>
 ';
@@ -49,18 +72,28 @@ class="tab-anchor ';
 
 ';
 			$iterations = 0;
-			foreach ($iterator = $ʟ_it = new LR\CachingIterator($tabs, $ʟ_it ?? null) as $tp_key => $tp_content) /* line 24 */ {
+			foreach ($iterator = $ʟ_it = new LR\CachingIterator($tabs, $ʟ_it ?? null) as $tp_key => $tp_content) /* line 40 */ {
 				echo '    <div 
       class="tab-panel ';
-				echo LR\Filters::escapeHtmlAttr($tp_key == 0 ? 'activeTab enter' : '') /* line 25 */;
+				echo LR\Filters::escapeHtmlAttr($tp_key == 0 ? 'activeTab enter' : '') /* line 41 */;
 				echo '" 
       data-id="panel-';
-				echo LR\Filters::escapeHtmlAttr($tp_key) /* line 26 */;
+				echo LR\Filters::escapeHtmlAttr($tp_key) /* line 42 */;
+				echo '"
+      id="panel-';
+				echo LR\Filters::escapeHtmlAttr($tabs_ids[$tp_key]) /* line 43 */;
+				echo '"
+      aria-labelledby="tab_';
+				echo LR\Filters::escapeHtmlAttr($tabs_ids[$tp_key]) /* line 45 */;
+				echo '"
+      role="tabpanel"
+      aria-hidden="';
+				echo LR\Filters::escapeHtmlAttr($tp_key == 0 ? 'false' : 'true') /* line 47 */;
 				echo '"
     >
       <div class="tab-panel__content">
         ';
-				$this->renderBlock('tab_panel', get_defined_vars()) /* line 30 */;
+				$this->renderBlock('tab_panel', get_defined_vars()) /* line 50 */;
 				echo '
       </div>
     </div>';
@@ -79,7 +112,7 @@ public function prepare(): void
 	{
 		extract($this->params);
 		if (!$this->getReferringTemplate() || $this->getReferenceType() === "extends") {
-			foreach (array_intersect_key(['ta_key' => '11', 'ta_content' => '11', 'tp_key' => '24', 'tp_content' => '24'], $this->params) as $ʟ_v => $ʟ_l) {
+			foreach (array_intersect_key(['tab_index' => '8', 'tab_content' => '8', 'ta_key' => '23', 'ta_content' => '23', 'tp_key' => '40', 'tp_content' => '40'], $this->params) as $ʟ_v => $ʟ_l) {
 				trigger_error("Variable \$$ʟ_v overwritten in foreach on line $ʟ_l");
 			}
 		}
@@ -87,14 +120,14 @@ public function prepare(): void
 	}
 
 
-	/** {block tab_anchor} on line 17 */
+	/** {block tab_anchor} on line 33 */
 	public function blockTab_anchor(array $ʟ_args): void
 	{
 		
 	}
 
 
-	/** {block tab_panel} on line 30 */
+	/** {block tab_panel} on line 50 */
 	public function blockTab_panel(array $ʟ_args): void
 	{