diff --git a/build/build.xml b/build/build.xml
index 80885e1ad9..e9c31618a5 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -103,13 +103,17 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -131,16 +135,26 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
diff --git a/components/com_kunena/admin/install/plugins/plg_kunena_alphauserpoints/activity.php b/components/com_kunena/admin/install/plugins/plg_kunena_alphauserpoints/activity.php
index 2591524f33..abb28893a2 100644
--- a/components/com_kunena/admin/install/plugins/plg_kunena_alphauserpoints/activity.php
+++ b/components/com_kunena/admin/install/plugins/plg_kunena_alphauserpoints/activity.php
@@ -72,8 +72,8 @@ public function onAfterThankyou($target, $actor, $message) {
$infoTargetUser = (JText::_ ( 'COM_KUNENA_THANKYOU_GOT' ).': ' . KunenaFactory::getUser($target)->username );
$infoRootUser = ( JText::_ ( 'COM_KUNENA_THANKYOU_SAID' ).': ' . KunenaFactory::getUser($actor)->username );
if ( $this->_checkPermissions($message) ) {
- $auptarget = AlphaUserPointsHelper::getAnyUserReferreID( $target );
- $aupactor = AlphaUserPointsHelper::getAnyUserReferreID( $actor );
+ $auptarget = AlphaUserPointsHelper::getAnyUserReferreID( $actor );
+ $aupactor = AlphaUserPointsHelper::getAnyUserReferreID( $target );
$ruleName = 'plgaup_kunena_message_thankyou';
diff --git a/components/com_kunena/site/template/crypsis/html/index.html b/components/com_kunena/site/template/crypsis/html/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/template/crypsis/html/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/template/crypsis/images/icons/index.html b/components/com_kunena/site/template/crypsis/images/icons/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/template/crypsis/images/icons/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/template/crypsis/images/index.html b/components/com_kunena/site/template/crypsis/images/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/template/crypsis/images/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/template/crypsis/images/mediabox/index.html b/components/com_kunena/site/template/crypsis/images/mediabox/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/template/crypsis/images/mediabox/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/template/crypsis/images/topicicons/index.html b/components/com_kunena/site/template/crypsis/images/topicicons/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/template/crypsis/images/topicicons/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/template/crypsis/images/topicicons/system/index.html b/components/com_kunena/site/template/crypsis/images/topicicons/system/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/template/crypsis/images/topicicons/system/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/template/crypsis/images/topicicons/user/index.html b/components/com_kunena/site/template/crypsis/images/topicicons/user/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/template/crypsis/images/topicicons/user/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/template/crypsis/index.html b/components/com_kunena/site/template/crypsis/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/template/crypsis/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/template/crypsis/js/index.html b/components/com_kunena/site/template/crypsis/js/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/template/crypsis/js/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/template/crypsis/kunena_tmpl_crypsis.xml b/components/com_kunena/site/template/crypsis/kunena_tmpl_crypsis.xml
index f127ae04af..6548821537 100644
--- a/components/com_kunena/site/template/crypsis/kunena_tmpl_crypsis.xml
+++ b/components/com_kunena/site/template/crypsis/kunena_tmpl_crypsis.xml
@@ -11,13 +11,17 @@
GNU/GPL
COM_KUNENA_TEMPLATE_CRYPSIS_DESC
- index.html
+ config.xml
+ mapping.php
+ README.md
template.php
- kunena_tmpl_crypsis.xml
- css
html
images
- js
+ js
+ language
+ layouts
+ less
media
+ pages
-
\ No newline at end of file
+
diff --git a/components/com_kunena/site/template/crypsis/language/en-GB/index.html b/components/com_kunena/site/template/crypsis/language/en-GB/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/template/crypsis/language/en-GB/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/template/crypsis/layouts/credits/README.md b/components/com_kunena/site/template/crypsis/layouts/credits/README.md
new file mode 100644
index 0000000000..e7a7007945
--- /dev/null
+++ b/components/com_kunena/site/template/crypsis/layouts/credits/README.md
@@ -0,0 +1,3 @@
+# Credits
+
+Displays Kunena team credits.
diff --git a/components/com_kunena/site/template/crypsis/layouts/empty/README.md b/components/com_kunena/site/template/crypsis/layouts/empty/README.md
new file mode 100644
index 0000000000..4f485af8f0
--- /dev/null
+++ b/components/com_kunena/site/template/crypsis/layouts/empty/README.md
@@ -0,0 +1,4 @@
+# Empty
+
+Empty template file which can be used for debugging purposes for example when layout isn't showing up.
+This can happen for example when user doesn't have permissions to display content in the layout.
diff --git a/components/com_kunena/site/template/crypsis/layouts/search/README.md b/components/com_kunena/site/template/crypsis/layouts/search/README.md
new file mode 100644
index 0000000000..38039bc818
--- /dev/null
+++ b/components/com_kunena/site/template/crypsis/layouts/search/README.md
@@ -0,0 +1,9 @@
+# Search
+
+Search related layouts.
+
+Available layouts for the search are:
+
+* Search/Button - Displays simple search form.
+* Search/Form - Displays advanced search form.
+* Search/Results - Displays search results.
diff --git a/components/com_kunena/site/template/crypsis/less/index.html b/components/com_kunena/site/template/crypsis/less/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/template/crypsis/less/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/template/crypsis/media/iconsets/editor/default/index.html b/components/com_kunena/site/template/crypsis/media/iconsets/editor/default/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/template/crypsis/media/iconsets/editor/default/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/template/crypsis/media/iconsets/editor/index.html b/components/com_kunena/site/template/crypsis/media/iconsets/editor/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/template/crypsis/media/iconsets/editor/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/template/crypsis/media/iconsets/index.html b/components/com_kunena/site/template/crypsis/media/iconsets/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/template/crypsis/media/iconsets/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/template/crypsis/media/iconsets/profile/default/index.html b/components/com_kunena/site/template/crypsis/media/iconsets/profile/default/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/template/crypsis/media/iconsets/profile/default/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/template/crypsis/media/iconsets/profile/index.html b/components/com_kunena/site/template/crypsis/media/iconsets/profile/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/template/crypsis/media/iconsets/profile/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/template/crypsis/media/index.html b/components/com_kunena/site/template/crypsis/media/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/template/crypsis/media/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/template/crypsis/modules/README.md b/components/com_kunena/site/template/crypsis/modules/README.md
deleted file mode 100644
index e092a14a1a..0000000000
--- a/components/com_kunena/site/template/crypsis/modules/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# Module layouts
diff --git a/components/com_kunena/site/views/announcement/index.html b/components/com_kunena/site/views/announcement/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/views/announcement/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/views/announcement/tmpl/index.html b/components/com_kunena/site/views/announcement/tmpl/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/views/announcement/tmpl/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/views/category/index.html b/components/com_kunena/site/views/category/index.html
deleted file mode 100644
index 42682b4746..0000000000
--- a/components/com_kunena/site/views/category/index.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/components/com_kunena/site/views/category/tmpl/create.php b/components/com_kunena/site/views/category/tmpl/create.php
deleted file mode 100644
index 30da92ffac..0000000000
--- a/components/com_kunena/site/views/category/tmpl/create.php
+++ /dev/null
@@ -1,13 +0,0 @@
-