diff --git a/CHANGES.txt b/CHANGES.txt
index 97abc2a..7b9588f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,10 @@
Change List
=========
+Version 1.4.17(Build 2022121900)
+- Added non JQuery UI versions of tabs and accordians. Thanks @alexmorrisnz
+- Fixed issue with custom course variables not being picked up if no courseid specified.
+Now @@COURSE:customvariable@@ should resolve in templates.
+
Version 1.4.16(Build 2022082200)
- Added lightbox, Buncee, Flip, Wordwall, Quizlet templates
diff --git a/accordion.js b/fakejqueryui/accordion.js
similarity index 100%
rename from accordion.js
rename to fakejqueryui/accordion.js
diff --git a/tabs.js b/fakejqueryui/tabs.js
similarity index 100%
rename from tabs.js
rename to fakejqueryui/tabs.js
diff --git a/presets/accordian.txt b/presets/accordian.txt
index 4b4e022..2851f14 100644
--- a/presets/accordian.txt
+++ b/presets/accordian.txt
@@ -1 +1 @@
-{"key":"accordian","name":"accordian","instructions":"Between the accordian tags enter as many accordian item tags as you need","requirecss":"//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css","requirejs":"filter/generico/accordion.js","shim":"","defaults":"","amd":"1","body":"
","bodyend":"
","script":" $(function() {\n $( \"#\" + @@AUTOID@@).accordion({\n header: \"h3\",\n heightStyle: \"content\"\n })\n});","style":"","dataset":"","datasetvars":"","alternate":"","alternateend":"","version":"1.0.1"}
+{"key":"accordian","name":"Accordian","instructions":"Between the accordian tags enter as many accordian item tags as you need","requirecss":"//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css","requirejs":"/filter/generico/fakejqueryui/accordion.js","shim":"","defaults":"","amd":"1","body":"","bodyend":"
","script":"$( \"#\" + @@AUTOID@@).accordion({\n header: \"h3\",\n heightStyle: \"content\"\n });;","style":"","dataset":"","datasetvars":"","alternate":"","alternateend":"","version":"1.0.2"}
\ No newline at end of file
diff --git a/presets/tabitem.txt b/presets/tabitem.txt
index 5b92088..7185a44 100755
--- a/presets/tabitem.txt
+++ b/presets/tabitem.txt
@@ -1 +1 @@
-{"key":"tabitem","name":"Tab Item","instructions":"Nest Generico tabitems in between Generico tabs, to produce a tabset. You can not put bullet points inside tabs.","requirecss":"","requirejs":"","shim":"","defaults":"title=\"my tab\"","amd":"1","body":"","bodyend":"
","script":"","style":"","dataset":"","datasetvars":"","alternate":"","alternateend":"","version":"1.0.1"}
\ No newline at end of file
+{"key":"tabitem","name":"Tab Item","instructions":"Nest Generico tabitems in between Generico tabs, to produce a tabset. ","requirecss":"","requirejs":"","shim":"","defaults":"title=\"my tab\"","amd":"1","body":"","bodyend":"
","script":"","style":"","dataset":"","datasetvars":"","alternate":"","alternateend":"","version":"1.0.2"}
\ No newline at end of file
diff --git a/presets/tabs.txt b/presets/tabs.txt
index a61c507..2b09a3e 100755
--- a/presets/tabs.txt
+++ b/presets/tabs.txt
@@ -1 +1 @@
-{"key":"tabs","name":"Tabs","instructions":"Tabs separate content by heading and are an efficient way to organize data and avoid lots of scrolling. Between the Generico tab tags nest as many Generico tabitem tags as you need. ","requirecss":"//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css","requirejs":"/filter/generico/tabs.js","shim":"","defaults":"","amd":"1","body":"","script":"var theul = $(\"#\" + @@AUTOID@@ + \" ul.filter_generico_tabs\");\n//because users may copy/paste/massage the tab items, we get html junk\n//so move any span nested tab items to directly under tabs\n$(\".filter_generico_tabitem\", $(\"#\" + @@AUTOID@@)).each(function () {\n $(this).unwrap('span');\n});\n\n//create li items for each tab item, ignore the (important) ul element and remove html junk\n$(\"#\" + @@AUTOID@@ + \" .filter_generico_tabs_container\").children().each(function () {\n if($(this).is(\".filter_generico_tabitem\")){\n theul.append(\"\"+this.title+\"\");\n //$(this).appendTo('#' + @@AUTOID@@); \n //end of if is tabitem\n}else if(!$(this).is('ul.filter_generico_tabs')){\n this.remove();\n}\n});\n\n//finally create the tabs\n$( \"#\" + @@AUTOID@@ + \" .filter_generico_tabs_container\").tabs();","style":"","dataset":"","datasetvars":"","alternate":"","alternateend":"","version":"1.0.3"}
\ No newline at end of file
+{"key":"tabs","name":"Tabs","instructions":"Tabs separate content by heading and are an efficient way to organize data and avoid lots of scrolling. Between the Generico tab tags nest as many Generico tabitem tags as you need. ","requirecss":"//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css","requirejs":"/filter/generico/fakejqueryui/tabs.js","shim":"","defaults":"","amd":"1","body":"","script":"var theul = $(\"#\" + @@AUTOID@@ + \" ul.filter_generico_tabs\");\n//because users may copy/paste/massage the tab items, we get html junk\n//so move any span nested tab items to directly under tabs\n$(\".filter_generico_tabitem\", $(\"#\" + @@AUTOID@@)).each(function () {\n $(this).unwrap('span');\n});\n\n//create li items for each tab item, ignore the (important) ul element and remove html junk\n$(\"#\" + @@AUTOID@@ + \" .filter_generico_tabs_container\").children().each(function () {\n if($(this).is(\".filter_generico_tabitem\")){\n theul.append(\"\"+this.title+\"\");\n //$(this).appendTo('#' + @@AUTOID@@); \n //end of if is tabitem\n}else if(!$(this).is('ul.filter_generico_tabs')){\n this.remove();\n}\n});\n\n//finally create the tabs\n$( \"#\" + @@AUTOID@@ + \" .filter_generico_tabs_container\").tabs();","style":"","dataset":"","datasetvars":"","alternate":"","alternateend":"","version":"1.0.4"}
\ No newline at end of file
diff --git a/version.php b/version.php
index 366f279..ab401c6 100644
--- a/version.php
+++ b/version.php
@@ -25,8 +25,8 @@
defined('MOODLE_INTERNAL') || die();
-$plugin->version = 2022082200; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->version = 2022121900; // The current plugin version (Date: YYYYMMDDXX)
$plugin->requires = 2011070100; // Requires this Moodle version
$plugin->component = 'filter_generico'; // Full name of the plugin (used for diagnostics)
$plugin->maturity = MATURITY_STABLE;
-$plugin->release = 'Version 1.4.16(Build 2022082200)';
+$plugin->release = 'Version 1.4.17(Build 2022121900)';