README.md

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.1) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.7) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -125,13 +125,13 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 19th September, 2018
++ *Last Build*: 7th October, 2018
-+ *Version*: 2.9.1
++ *Version*: 2.9.7
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **193291**
++ *Line count*: **195701**
-+ *Field count*: **1081**
++ *Field count*: **1087**
-+ *File count*: **1273**
++ *File count*: **1277**
 + *Folder count*: **201**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/README.txt

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.1) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.7) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -125,13 +125,13 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 19th September, 2018
++ *Last Build*: 7th October, 2018
-+ *Version*: 2.9.1
++ *Version*: 2.9.7
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **193291**
++ *Line count*: **195701**
-+ *Field count*: **1081**
++ *Field count*: **1087**
-+ *File count*: **1273**
++ *File count*: **1277**
 + *Folder count*: **201**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/access.xml

@@ -15,6 +15,7 @@
 		<action name="core.edit.own" title="JACTION_EDITOWN" description="JACTION_EDITOWN_COMPONENT_DESC" />
 		<action name="core.edit.created_by" title="COM_COMPONENTBUILDER_EDIT_CREATED_BY" description="COM_COMPONENTBUILDER_EDIT_CREATED_BY_DESC" />
 		<action name="core.edit.created" title="COM_COMPONENTBUILDER_EDIT_CREATED_DATE" description="COM_COMPONENTBUILDER_EDIT_CREATED_DATE_DESC" />
+		<action name="admin_view.run_expansion" title="COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="admin_view.access" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS_DESC" />
 		<action name="admin_view.batch" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE_DESC" />
 		<action name="admin_view.create" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE_DESC" />
@@ -73,6 +74,7 @@
 		<action name="compiler.access" title="COM_COMPONENTBUILDER_COMPILER_ACCESS" description="COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC" />
 		<action name="compiler.clear_tmp" title="COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS_DESC" />
 		<action name="compiler.dashboard_list" title="COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST_DESC" />
+		<action name="compiler.run_expansion" title="COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="compiler.submenu" title="COM_COMPONENTBUILDER_COMPILER_SUBMENU" description="COM_COMPONENTBUILDER_COMPILER_SUBMENU_DESC" />
 		<action name="component_admin_views.access" title="COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_ACCESS" description="COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_ACCESS_DESC" />
 		<action name="component_admin_views.batch" title="COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_BATCH_USE" description="COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_BATCH_USE_DESC" />
@@ -173,6 +175,7 @@
 		<action name="custom_admin_view.export" title="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EXPORT" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_EXPORT_DESC" />
 		<action name="custom_admin_view.import" title="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_IMPORT" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_IMPORT_DESC" />
 		<action name="custom_admin_view.submenu" title="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_SUBMENU" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_SUBMENU_DESC" />
+		<action name="custom_code.run_expansion" title="COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="custom_code.access" title="COM_COMPONENTBUILDER_CUSTOM_CODES_ACCESS" description="COM_COMPONENTBUILDER_CUSTOM_CODES_ACCESS_DESC" />
 		<action name="custom_code.batch" title="COM_COMPONENTBUILDER_CUSTOM_CODES_BATCH_USE" description="COM_COMPONENTBUILDER_CUSTOM_CODES_BATCH_USE_DESC" />
 		<action name="custom_code.create" title="COM_COMPONENTBUILDER_CUSTOM_CODES_CREATE" description="COM_COMPONENTBUILDER_CUSTOM_CODES_CREATE_DESC" />
@@ -187,6 +190,7 @@
 		<action name="custom_code.export" title="COM_COMPONENTBUILDER_CUSTOM_CODES_EXPORT" description="COM_COMPONENTBUILDER_CUSTOM_CODES_EXPORT_DESC" />
 		<action name="custom_code.import" title="COM_COMPONENTBUILDER_CUSTOM_CODES_IMPORT" description="COM_COMPONENTBUILDER_CUSTOM_CODES_IMPORT_DESC" />
 		<action name="custom_code.submenu" title="COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU" description="COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU_DESC" />
+		<action name="dynamic_get.run_expansion" title="COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="dynamic_get.access" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS_DESC" />
 		<action name="dynamic_get.batch" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_BATCH_USE" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_BATCH_USE_DESC" />
 		<action name="dynamic_get.create" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_CREATE" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_CREATE_DESC" />
@@ -200,6 +204,7 @@
 		<action name="dynamic_get.export" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_EXPORT" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_EXPORT_DESC" />
 		<action name="dynamic_get.import" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_IMPORT" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_IMPORT_DESC" />
 		<action name="dynamic_get.submenu" title="COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU" description="COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU_DESC" />
+		<action name="field.run_expansion" title="COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="field.access" title="COM_COMPONENTBUILDER_FIELDS_ACCESS" description="COM_COMPONENTBUILDER_FIELDS_ACCESS_DESC" />
 		<action name="field.batch" title="COM_COMPONENTBUILDER_FIELDS_BATCH_USE" description="COM_COMPONENTBUILDER_FIELDS_BATCH_USE_DESC" />
 		<action name="field.create" title="COM_COMPONENTBUILDER_FIELDS_CREATE" description="COM_COMPONENTBUILDER_FIELDS_CREATE_DESC" />
@@ -219,16 +224,16 @@
 		<action name="fieldtype.dashboard_add" title="COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_ADD" description="COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_ADD_DESC" />
 		<action name="fieldtype.dashboard_list" title="COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_LIST_DESC" />
 		<action name="fieldtype.delete" title="COM_COMPONENTBUILDER_FIELDTYPES_DELETE" description="COM_COMPONENTBUILDER_FIELDTYPES_DELETE_DESC" />
-		<action name="fieldtype..description" title="COM_COMPONENTBUILDER_FIELDTYPES_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_DESCRIPTION_DESC" />
 		<action name="fieldtype.edit" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESC" />
+		<action name="fieldtype.edit.description" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION_DESC" />
+		<action name="fieldtype.edit.name" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME_DESC" />
 		<action name="fieldtype.edit.own" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN_DESC" />
+		<action name="fieldtype.edit.properties" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES_DESC" />
+		<action name="fieldtype.edit.short_description" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION_DESC" />
 		<action name="fieldtype.edit.state" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE_DESC" />
 		<action name="fieldtype.version" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION_DESC" />
 		<action name="fieldtype.export" title="COM_COMPONENTBUILDER_FIELDTYPES_EXPORT" description="COM_COMPONENTBUILDER_FIELDTYPES_EXPORT_DESC" />
 		<action name="fieldtype.import" title="COM_COMPONENTBUILDER_FIELDTYPES_IMPORT" description="COM_COMPONENTBUILDER_FIELDTYPES_IMPORT_DESC" />
-		<action name="fieldtype..name" title="COM_COMPONENTBUILDER_FIELDTYPES_NAME" description="COM_COMPONENTBUILDER_FIELDTYPES_NAME_DESC" />
-		<action name="fieldtype..properties" title="COM_COMPONENTBUILDER_FIELDTYPES_PROPERTIES" description="COM_COMPONENTBUILDER_FIELDTYPES_PROPERTIES_DESC" />
-		<action name="fieldtype..short_description" title="COM_COMPONENTBUILDER_FIELDTYPES_SHORT_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_SHORT_DESCRIPTION_DESC" />
 		<action name="fieldtype.submenu" title="COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU" description="COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU_DESC" />
 		<action name="get_snippets.access" title="COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS" description="COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS_DESC" />
 		<action name="get_snippets.custom_admin_views" title="COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS_DESC" />
@@ -252,9 +257,11 @@
 		<action name="help_document.import" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_IMPORT" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_IMPORT_DESC" />
 		<action name="help_document.submenu" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU_DESC" />
 		<action name="joomla_component.backup" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS_DESC" />
+		<action name="joomla_component.clear_tmp" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS_DESC" />
 		<action name="joomla_component.clone" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS_DESC" />
 		<action name="joomla_component.export_jcb_packages" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC" />
 		<action name="joomla_component.import_jcb_packages" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC" />
+		<action name="joomla_component.run_expansion" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS_DESC" />
 		<action name="joomla_component.access" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS_DESC" />
 		<action name="joomla_component.batch" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_USE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_USE_DESC" />
 		<action name="joomla_component.create" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_CREATE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_CREATE_DESC" />
@@ -515,10 +522,10 @@
 		<action name="fieldtype.create" title="COM_COMPONENTBUILDER_FIELDTYPES_CREATE" description="COM_COMPONENTBUILDER_FIELDTYPES_CREATE_DESC" />
 		<action name="fieldtype.delete" title="COM_COMPONENTBUILDER_FIELDTYPES_DELETE" description="COM_COMPONENTBUILDER_FIELDTYPES_DELETE_DESC" />
 		<action name="fieldtype.access" title="COM_COMPONENTBUILDER_FIELDTYPES_ACCESS" description="COM_COMPONENTBUILDER_FIELDTYPES_ACCESS_DESC" />
-		<action name="fieldtype..name" title="COM_COMPONENTBUILDER_FIELDTYPES_NAME" description="COM_COMPONENTBUILDER_FIELDTYPES_NAME_DESC" />
+		<action name="fieldtype.edit.name" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME_DESC" />
-		<action name="fieldtype..properties" title="COM_COMPONENTBUILDER_FIELDTYPES_PROPERTIES" description="COM_COMPONENTBUILDER_FIELDTYPES_PROPERTIES_DESC" />
+		<action name="fieldtype.edit.properties" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES_DESC" />
-		<action name="fieldtype..description" title="COM_COMPONENTBUILDER_FIELDTYPES_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_DESCRIPTION_DESC" />
+		<action name="fieldtype.edit.description" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION_DESC" />
-		<action name="fieldtype..short_description" title="COM_COMPONENTBUILDER_FIELDTYPES_SHORT_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_SHORT_DESCRIPTION_DESC" />
+		<action name="fieldtype.edit.short_description" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION_DESC" />
 		<action name="fieldtype.version" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION_DESC" />
 	</section>
 	<section name="language_translation">

admin/assets/css/admin_view.css

@@ -11,3 +11,6 @@
 /* CSS Document */
 
 
+.bestview {
+width: 100%;
+}

admin/compiler/joomla_3/JFormFieldCheckboxes.php

@@ -36,9 +36,9 @@ class JFormField###Type### extends JFormFieldCheckboxes
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		###JFORM_GETOPTIONS_PHP###
 	}

admin/compiler/joomla_3/JFormFieldCustom.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
+ * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+ * @copyright  Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+?>
+###BOM###
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the ###JFORM_extends### field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('###JFORM_extends###');
+
+/**
+ * ###Type### Form Field class for the ###Component### component
+ */
+class JFormField###Type### extends JFormField###JFORM_EXTENDS###
+{
+	/**
+	 * The ###type### field type.
+	 *
+	 * @var		string
+	 */
+	public $type = '###type###';###JFORM_TYPE_PHP###
+}

admin/compiler/joomla_3/JFormFieldList.php

@@ -36,9 +36,9 @@ class JFormField###Type### extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		###JFORM_GETOPTIONS_PHP###
 	}

admin/compiler/joomla_3/JFormFieldRadio.php

@@ -36,9 +36,9 @@ class JFormField###Type### extends JFormFieldRadio
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		###JFORM_GETOPTIONS_PHP###
 	}

admin/compiler/joomla_3/component.xml

@@ -33,7 +33,7 @@
 	<scriptfile>script.php</scriptfile>
 
 	<media destination="com_###component###" folder="media">
-		<filename>index.html</filename>
+		<filename>index.html</filename>###EXSTRA_MEDIA_FILES###
 		<folder>js</folder>
 		<folder>css</folder>
 		<folder>images</folder>###EXSTRA_MEDIA_FOLDERS###
@@ -50,7 +50,7 @@
 		<filename>controller.php</filename>
 		<filename>index.html</filename>
 		<filename>router.php</filename>
-		<filename>###component###.php</filename>
+		<filename>###component###.php</filename>###EXSTRA_SITE_FILES###
 		<folder>assets</folder>
 		<folder>helpers</folder>
 		<folder>controllers</folder>

admin/compiler/joomla_3/settings.json

@@ -400,6 +400,11 @@
 					"rename": "layoutmetadata",
 					"type": "layoutmetadata"
 				},
+				"JFormFieldCustom.php": {
+					"path": "c0mp0n3nt/admin/models/fields",
+					"rename": "JFormFieldCustom",
+					"type": "fieldcustom"
+				},
 				"JFormFieldList.php": {
 					"path": "c0mp0n3nt/admin/models/fields",
 					"rename": "JFormFieldList",

admin/config.xml

@@ -86,6 +86,7 @@
 			description="COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGE_DIRECTORIES_DESCRIPTION"
 			class="list_class"
 			multiple="true"
+			default=""
 			showon="manage_jcb_package_directories:1">
 			<!-- Option Set. -->
 			<option value="vdm">
@@ -116,7 +117,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_MENU_PREFIX_LABEL"
 			size="30"
 			maxlength="30"
-			default="&#187;"
+			default="&amp;#187;"
 			description="COM_COMPONENTBUILDER_CONFIG_MENU_PREFIX_DESCRIPTION"
 			class="text_area"
 			filter="SAFEHTML"
@@ -688,9 +689,9 @@
 				COM_COMPONENTBUILDER_CONFIG_EXPANSION</option>
 		</field>
 		<!-- Note_development_method_default Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_development_method_default" label="COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_DEFAULT_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_DEFAULT_DESCRIPTION" heading="h4" class="alert alert-info note_development_method_default" showon="development_method:1" />
+		<field type="note" name="note_development_method_default" label="COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_DEFAULT_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_DEFAULT_DESCRIPTION" heading="h2" class="alert alert-info note_development_method_default" showon="development_method:1" />
 		<!-- Note_development_method_expansion Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_development_method_expansion" label="COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_EXPANSION_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_EXPANSION_DESCRIPTION" heading="h4" class="alert alert-info note_development_method_expansion" showon="development_method:2" />
+		<field type="note" name="note_development_method_expansion" label="COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_EXPANSION_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_EXPANSION_DESCRIPTION" heading="h2" class="alert alert-info note_development_method_expansion" showon="development_method:2" />
 		<!-- Expansion Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -741,6 +742,7 @@
 					name="placeholders"
 					label="COM_COMPONENTBUILDER_CONFIG_PLACEHOLDERS_LABEL"
 					value="1"
+					default=""
 					required="false"
 					description="COM_COMPONENTBUILDER_CONFIG_PLACEHOLDERS_DESCRIPTION"
 					class="inputbox"
@@ -804,6 +806,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_LABEL"
 			size="70"
 			maxlength="150"
+			default=""
 			description="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_DESCRIPTION"
 			class="text_area"
 			readonly="false"
@@ -861,6 +864,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_LABEL"
 			size="70"
 			maxlength="150"
+			default=""
 			description="COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_DESCRIPTION"
 			class="text_area"
 			readonly="false"
@@ -879,6 +883,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_LABEL"
 			size="70"
 			maxlength="150"
+			default=""
 			description="COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_DESCRIPTION"
 			class="text_area"
 			readonly="false"
@@ -897,6 +902,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_BACKUP_FOLDER_PATH_LABEL"
 			size="70"
 			maxlength="150"
+			default=""
 			description="COM_COMPONENTBUILDER_CONFIG_BACKUP_FOLDER_PATH_DESCRIPTION"
 			class="text_area"
 			readonly="false"
@@ -915,6 +921,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_LABEL"
 			size="70"
 			maxlength="150"
+			default=""
 			description="COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_DESCRIPTION"
 			class="text_area"
 			readonly="false"
@@ -983,6 +990,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_LABEL"
 			size="60"
 			maxlength="150"
+			default=""
 			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_DESCRIPTION"
 			class="text_area"
 			required="true"

admin/controllers/admin_views.php

@@ -103,4 +103,45 @@ class ComponentbuilderControllerAdmin_views extends JControllerAdmin
 		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=admin_views', false), $message, 'error');
 		return;
 	}
+
+
+	/**
+	 * Run the Expansion
+	 *
+	 * @return  void
+	 */
+	public function runExpansion()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		// check if user has the right
+		$user = JFactory::getUser();
+		// set page redirect
+		$redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=admin_views', false);
+		// set massage
+		$message = JText::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
+		// check if this user has the right to run expansion
+		if($user->authorise('compiler.run_expansion', 'com_componentbuilder'))
+		{
+			// set massage
+			$message = JText::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
+			// run expansion via API
+			$result = ComponentbuilderHelper::getFileContents(JURI::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			// is there a message returned
+			if (!is_numeric($result) && ComponentbuilderHelper::checkString($result))
+			{
+				$this->setRedirect($redirect_url, $result);
+				return true;
+			}
+			elseif (is_numeric($result) && 1 == $result)
+			{
+				$message = JText::_('COM_COMPONENTBUILDER_BTHE_EXPANSION_WAS_SUCCESSFULLYB_TO_SEE_MORE_INFORMATION_CHANGE_THE_BRETURN_OPTIONS_FOR_BUILDB_TO_BDISPLAY_MESSAGEB_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TABB');
+				$this->setRedirect($redirect_url, $message, 'message');
+				return true;
+			}
+		}
+		$this->setRedirect($redirect_url, $message, 'error');
+		return false;
+	}
+
 }

admin/controllers/compiler.php

@@ -35,11 +35,84 @@ class ComponentbuilderControllerCompiler extends JControllerAdmin
 		return;
 	}
 
+
 	/**
-	 * Import an spreadsheet.
+	 * Run the Expansion
 	 *
 	 * @return  void
 	 */
+	public function runExpansion()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		// check if user has the right
+		$user = JFactory::getUser();
+		// set page redirect
+		$redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=compiler', false);
+		// set massage
+		$message = JText::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
+		// check if this user has the right to run expansion
+		if($user->authorise('compiler.run_expansion', 'com_componentbuilder'))
+		{
+			// set massage
+			$message = JText::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
+			// run expansion via API
+			$result = ComponentbuilderHelper::getFileContents(JURI::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			// is there a message returned
+			if (!is_numeric($result) && ComponentbuilderHelper::checkString($result))
+			{
+				$this->setRedirect($redirect_url, $result);
+				return true;
+			}
+			elseif (is_numeric($result) && 1 == $result)
+			{
+				$message = JText::_('COM_COMPONENTBUILDER_BTHE_EXPANSION_WAS_SUCCESSFULLYB_TO_SEE_MORE_INFORMATION_CHANGE_THE_BRETURN_OPTIONS_FOR_BUILDB_TO_BDISPLAY_MESSAGEB_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TABB');
+				$this->setRedirect($redirect_url, $message, 'message');
+				return true;
+			}
+		}
+		$this->setRedirect($redirect_url, $message, 'error');
+		return false;
+	}
+
+
+	/**
+	 * Clear tmp folder
+	 *
+	 * @return  true on success
+	 */
+	public function clearTmp()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		// check if user has the right
+		$user = JFactory::getUser();
+		// set page redirect
+		$redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=compiler', false);
+		$message = JText::_('COM_COMPONENTBUILDER_COULD_NOT_CLEAR_THE_TMP_FOLDER');
+		if($user->authorise('core.admin', 'com_componentbuilder'))
+		{
+			// get the model
+			$model = $this->getModel('compiler');
+			// get tmp folder
+			$comConfig = JFactory::getConfig();
+			$tmp = $comConfig->get('tmp_path');
+			if ($model->emptyFolder($tmp))
+			{
+				$message = JText::_('COM_COMPONENTBUILDER_BTHE_TMP_FOLDER_HAS_BEEN_CLEAR_SUCCESSFULLYB');
+				$this->setRedirect($redirect_url, $message, 'message');
+				return true;
+			}
+		}
+		$this->setRedirect($redirect_url, $message, 'error');
+		return false;
+	}
+
+	/**
+	 * Run the Compiler
+	 *
+	 * @return  true on success
+	 */
 	public function compiler()
 	{
 		// Check for request forgeries
@@ -125,33 +198,11 @@ class ComponentbuilderControllerCompiler extends JControllerAdmin
 		return false;
 	}
 
-	public function clearTmp()
+	/**
-	{
+	 * Install Compiled Extension
-		// Check for request forgeries
+	 *
-		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+	 * @return  true on success
-		// check if user has the right
+	 */
-		$user = JFactory::getUser();
-		// set page redirect
-		$redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=compiler', false);
-		$message = 'Could not clear the tmp folder';
-		if($user->authorise('core.admin', 'com_componentbuilder'))
-		{
-			// get the model
-			$model = $this->getModel('compiler');
-			// get tmp folder
-			$comConfig = JFactory::getConfig();
-			$tmp = $comConfig->get('tmp_path');
-			if ($model->emptyFolder($tmp))
-			{
-				$message = '<b>The tmp folder has been clear successfully!</b>';
-				$this->setRedirect($redirect_url,$message,'message');
-				return true;
-			}
-		}
-		$this->setRedirect($redirect_url,$message,'error');
-		return false;
-	}
-
 	public function installExtention()
 	{
 		// Check for request forgeries

admin/controllers/custom_codes.php

@@ -103,4 +103,45 @@ class ComponentbuilderControllerCustom_codes extends JControllerAdmin
 		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=custom_codes', false), $message, 'error');
 		return;
 	}
+
+
+	/**
+	 * Run the Expansion
+	 *
+	 * @return  void
+	 */
+	public function runExpansion()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		// check if user has the right
+		$user = JFactory::getUser();
+		// set page redirect
+		$redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=custom_codes', false);
+		// set massage
+		$message = JText::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
+		// check if this user has the right to run expansion
+		if($user->authorise('compiler.run_expansion', 'com_componentbuilder'))
+		{
+			// set massage
+			$message = JText::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
+			// run expansion via API
+			$result = ComponentbuilderHelper::getFileContents(JURI::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			// is there a message returned
+			if (!is_numeric($result) && ComponentbuilderHelper::checkString($result))
+			{
+				$this->setRedirect($redirect_url, $result);
+				return true;
+			}
+			elseif (is_numeric($result) && 1 == $result)
+			{
+				$message = JText::_('COM_COMPONENTBUILDER_BTHE_EXPANSION_WAS_SUCCESSFULLYB_TO_SEE_MORE_INFORMATION_CHANGE_THE_BRETURN_OPTIONS_FOR_BUILDB_TO_BDISPLAY_MESSAGEB_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TABB');
+				$this->setRedirect($redirect_url, $message, 'message');
+				return true;
+			}
+		}
+		$this->setRedirect($redirect_url, $message, 'error');
+		return false;
+	}
+
 }

admin/controllers/dynamic_gets.php

@@ -103,4 +103,45 @@ class ComponentbuilderControllerDynamic_gets extends JControllerAdmin
 		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=dynamic_gets', false), $message, 'error');
 		return;
 	}
+
+
+	/**
+	 * Run the Expansion
+	 *
+	 * @return  void
+	 */
+	public function runExpansion()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		// check if user has the right
+		$user = JFactory::getUser();
+		// set page redirect
+		$redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=dynamic_gets', false);
+		// set massage
+		$message = JText::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
+		// check if this user has the right to run expansion
+		if($user->authorise('compiler.run_expansion', 'com_componentbuilder'))
+		{
+			// set massage
+			$message = JText::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
+			// run expansion via API
+			$result = ComponentbuilderHelper::getFileContents(JURI::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			// is there a message returned
+			if (!is_numeric($result) && ComponentbuilderHelper::checkString($result))
+			{
+				$this->setRedirect($redirect_url, $result);
+				return true;
+			}
+			elseif (is_numeric($result) && 1 == $result)
+			{
+				$message = JText::_('COM_COMPONENTBUILDER_BTHE_EXPANSION_WAS_SUCCESSFULLYB_TO_SEE_MORE_INFORMATION_CHANGE_THE_BRETURN_OPTIONS_FOR_BUILDB_TO_BDISPLAY_MESSAGEB_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TABB');
+				$this->setRedirect($redirect_url, $message, 'message');
+				return true;
+			}
+		}
+		$this->setRedirect($redirect_url, $message, 'error');
+		return false;
+	}
+
 }

admin/controllers/fields.php

@@ -103,4 +103,45 @@ class ComponentbuilderControllerFields extends JControllerAdmin
 		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view=fields', false), $message, 'error');
 		return;
 	}
+
+
+	/**
+	 * Run the Expansion
+	 *
+	 * @return  void
+	 */
+	public function runExpansion()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		// check if user has the right
+		$user = JFactory::getUser();
+		// set page redirect
+		$redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=fields', false);
+		// set massage
+		$message = JText::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
+		// check if this user has the right to run expansion
+		if($user->authorise('compiler.run_expansion', 'com_componentbuilder'))
+		{
+			// set massage
+			$message = JText::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
+			// run expansion via API
+			$result = ComponentbuilderHelper::getFileContents(JURI::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			// is there a message returned
+			if (!is_numeric($result) && ComponentbuilderHelper::checkString($result))
+			{
+				$this->setRedirect($redirect_url, $result);
+				return true;
+			}
+			elseif (is_numeric($result) && 1 == $result)
+			{
+				$message = JText::_('COM_COMPONENTBUILDER_BTHE_EXPANSION_WAS_SUCCESSFULLYB_TO_SEE_MORE_INFORMATION_CHANGE_THE_BRETURN_OPTIONS_FOR_BUILDB_TO_BDISPLAY_MESSAGEB_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TABB');
+				$this->setRedirect($redirect_url, $message, 'message');
+				return true;
+			}
+		}
+		$this->setRedirect($redirect_url, $message, 'error');
+		return false;
+	}
+
 }

admin/controllers/joomla_components.php

@@ -104,6 +104,79 @@ class ComponentbuilderControllerJoomla_components extends JControllerAdmin
 		return;
 	}
 
+
+	/**
+	 * Run the Expansion
+	 *
+	 * @return  void
+	 */
+	public function runExpansion()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		// check if user has the right
+		$user = JFactory::getUser();
+		// set page redirect
+		$redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=joomla_components', false);
+		// set massage
+		$message = JText::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
+		// check if this user has the right to run expansion
+		if($user->authorise('compiler.run_expansion', 'com_componentbuilder'))
+		{
+			// set massage
+			$message = JText::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
+			// run expansion via API
+			$result = ComponentbuilderHelper::getFileContents(JURI::root() . 'index.php?option=com_componentbuilder&task=api.expand');
+			// is there a message returned
+			if (!is_numeric($result) && ComponentbuilderHelper::checkString($result))
+			{
+				$this->setRedirect($redirect_url, $result);
+				return true;
+			}
+			elseif (is_numeric($result) && 1 == $result)
+			{
+				$message = JText::_('COM_COMPONENTBUILDER_BTHE_EXPANSION_WAS_SUCCESSFULLYB_TO_SEE_MORE_INFORMATION_CHANGE_THE_BRETURN_OPTIONS_FOR_BUILDB_TO_BDISPLAY_MESSAGEB_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TABB');
+				$this->setRedirect($redirect_url, $message, 'message');
+				return true;
+			}
+		}
+		$this->setRedirect($redirect_url, $message, 'error');
+		return false;
+	}
+
+
+	/**
+	 * Clear tmp folder
+	 *
+	 * @return  true on success
+	 */
+	public function clearTmp()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		// check if user has the right
+		$user = JFactory::getUser();
+		// set page redirect
+		$redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=joomla_components', false);
+		$message = JText::_('COM_COMPONENTBUILDER_COULD_NOT_CLEAR_THE_TMP_FOLDER');
+		if($user->authorise('core.admin', 'com_componentbuilder'))
+		{
+			// get the model
+			$model = $this->getModel('compiler');
+			// get tmp folder
+			$comConfig = JFactory::getConfig();
+			$tmp = $comConfig->get('tmp_path');
+			if ($model->emptyFolder($tmp))
+			{
+				$message = JText::_('COM_COMPONENTBUILDER_BTHE_TMP_FOLDER_HAS_BEEN_CLEAR_SUCCESSFULLYB');
+				$this->setRedirect($redirect_url, $message, 'message');
+				return true;
+			}
+		}
+		$this->setRedirect($redirect_url, $message, 'error');
+		return false;
+	}
+
 	public function smartImport()
 	{
 		// check if import is allowed for this user.
@@ -353,7 +426,7 @@ class ComponentbuilderControllerJoomla_components extends JControllerAdmin
 		// quite only if auto backup (adding this script from custom code :)
 		if ('backup' === 'manualBackup')
 		{
-			echo "# Error\n".JText::_('COM_COMPONENTBUILDER_ACCESS_DENIED');
+			echo "# Error\n" . JText::_('COM_COMPONENTBUILDER_ACCESS_DENIED');
 			// clear session
 			JFactory::getApplication()->getSession()->destroy();
 			jexit();

admin/custom/uikit-v3/js/uikit-icons.js

@@ -1,262 +1,159 @@
-/*! UIkit 3.0.0-beta.34 | http://www.getuikit.com | (c) 2014 - 2017 YOOtheme | MIT License */
+/*! UIkit 3.0.0-rc.16 | http://www.getuikit.com | (c) 2014 - 2018 YOOtheme | MIT License */
 
 (function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
-	typeof define === 'function' && define.amd ? define('uikiticons', factory) :
+    typeof define === 'function' && define.amd ? define('uikiticons', factory) :
-	(global.UIkitIcons = factory());
+    (global.UIkitIcons = factory());
 }(this, (function () { 'use strict';
 
-var album = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"5\" y=\"2\" width=\"10\" height=\"1\"></rect> <rect x=\"3\" y=\"4\" width=\"14\" height=\"1\"></rect> <rect fill=\"none\" stroke=\"#000\" x=\"1.5\" y=\"6.5\" width=\"17\" height=\"11\"></rect></svg>";
+    function plugin(UIkit) {
-var ban = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"10\" cy=\"10\" r=\"9\"></circle> <line fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" x1=\"4\" y1=\"3.5\" x2=\"16\" y2=\"16.5\"></line></svg>";
-var behance = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M9.5,10.6c-0.4-0.5-0.9-0.9-1.6-1.1c1.7-1,2.2-3.2,0.7-4.7C7.8,4,6.3,4,5.2,4C3.5,4,1.7,4,0,4v12c1.7,0,3.4,0,5.2,0 c1,0,2.1,0,3.1-0.5C10.2,14.6,10.5,12.3,9.5,10.6L9.5,10.6z M5.6,6.1c1.8,0,1.8,2.7-0.1,2.7c-1,0-2,0-2.9,0V6.1H5.6z M2.6,13.8v-3.1 c1.1,0,2.1,0,3.2,0c2.1,0,2.1,3.2,0.1,3.2L2.6,13.8z\"></path> <path d=\"M19.9,10.9C19.7,9.2,18.7,7.6,17,7c-4.2-1.3-7.3,3.4-5.3,7.1c0.9,1.7,2.8,2.3,4.7,2.1c1.7-0.2,2.9-1.3,3.4-2.9h-2.2 c-0.4,1.3-2.4,1.5-3.5,0.6c-0.4-0.4-0.6-1.1-0.6-1.7H20C20,11.7,19.9,10.9,19.9,10.9z M13.5,10.6c0-1.6,2.3-2.7,3.5-1.4 c0.4,0.4,0.5,0.9,0.6,1.4H13.5L13.5,10.6z\"></path> <rect x=\"13\" y=\"4\" width=\"5\" height=\"1.4\"></rect></svg>";
-var bell = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M17,15.5 L3,15.5 C2.99,14.61 3.79,13.34 4.1,12.51 C4.58,11.3 4.72,10.35 5.19,7.01 C5.54,4.53 5.89,3.2 7.28,2.16 C8.13,1.56 9.37,1.5 9.81,1.5 L9.96,1.5 C9.96,1.5 11.62,1.41 12.67,2.17 C14.08,3.2 14.42,4.54 14.77,7.02 C15.26,10.35 15.4,11.31 15.87,12.52 C16.2,13.34 17.01,14.61 17,15.5 L17,15.5 Z\"></path> <path fill=\"none\" stroke=\"#000\" d=\"M12.39,16 C12.39,17.37 11.35,18.43 9.91,18.43 C8.48,18.43 7.42,17.37 7.42,16\"></path></svg>";
-var bold = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M5,15.3 C5.66,15.3 5.9,15 5.9,14.53 L5.9,5.5 C5.9,4.92 5.56,4.7 5,4.7 L5,4 L8.95,4 C12.6,4 13.7,5.37 13.7,6.9 C13.7,7.87 13.14,9.17 10.86,9.59 L10.86,9.7 C13.25,9.86 14.29,11.28 14.3,12.54 C14.3,14.47 12.94,16 9,16 L5,16 L5,15.3 Z M9,9.3 C11.19,9.3 11.8,8.5 11.85,7 C11.85,5.65 11.3,4.8 9,4.8 L7.67,4.8 L7.67,9.3 L9,9.3 Z M9.185,15.22 C11.97,15 12.39,14 12.4,12.58 C12.4,11.15 11.39,10 9,10 L7.67,10 L7.67,15 L9.18,15 Z\"></path></svg>";
-var bolt = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M4.74,20 L7.73,12 L3,12 L15.43,1 L12.32,9 L17.02,9 L4.74,20 L4.74,20 L4.74,20 Z M9.18,11 L7.1,16.39 L14.47,10 L10.86,10 L12.99,4.67 L5.61,11 L9.18,11 L9.18,11 L9.18,11 Z\"></path></svg>";
-var bookmark = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon fill=\"none\" stroke=\"#000\" points=\"5.5 1.5 15.5 1.5 15.5 17.5 10.5 12.5 5.5 17.5\"></polygon></svg>";
-var calendar = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M 2,3 2,17 18,17 18,3 2,3 Z M 17,16 3,16 3,8 17,8 17,16 Z M 17,7 3,7 3,4 17,4 17,7 Z\"></path> <rect width=\"1\" height=\"3\" x=\"6\" y=\"2\"></rect> <rect width=\"1\" height=\"3\" x=\"13\" y=\"2\"></rect></svg>";
-var camera = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"10\" cy=\"10.8\" r=\"3.8\"></circle> <path fill=\"none\" stroke=\"#000\" d=\"M1,4.5 C0.7,4.5 0.5,4.7 0.5,5 L0.5,17 C0.5,17.3 0.7,17.5 1,17.5 L19,17.5 C19.3,17.5 19.5,17.3 19.5,17 L19.5,5 C19.5,4.7 19.3,4.5 19,4.5 L13.5,4.5 L13.5,2.9 C13.5,2.6 13.3,2.5 13,2.5 L7,2.5 C6.7,2.5 6.5,2.6 6.5,2.9 L6.5,4.5 L1,4.5 L1,4.5 Z\"></path></svg>";
-var cart = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle cx=\"7.3\" cy=\"17.3\" r=\"1.4\"></circle> <circle cx=\"13.3\" cy=\"17.3\" r=\"1.4\"></circle> <polyline fill=\"none\" stroke=\"#000\" points=\"0 2 3.2 4 5.3 12.5 16 12.5 18 6.5 8 6.5\"></polyline></svg>";
-var check = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" points=\"4,10 8,15 17,4\"></polyline></svg>";
-var clock = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"10\" cy=\"10\" r=\"9\"></circle> <rect x=\"9\" y=\"4\" width=\"1\" height=\"7\"></rect> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M13.018,14.197 L9.445,10.625\"></path></svg>";
-var close = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.06\" d=\"M16,16 L4,4\"></path> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.06\" d=\"M16,4 L4,16\"></path></svg>";
-var code = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" stroke-width=\"1.01\" points=\"13,4 19,10 13,16\"></polyline> <polyline fill=\"none\" stroke=\"#000\" stroke-width=\"1.01\" points=\"7,4 1,10 7,16\"></polyline></svg>";
-var cog = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" cx=\"9.997\" cy=\"10\" r=\"3.31\"></circle> <path fill=\"none\" stroke=\"#000\" d=\"M18.488,12.285 L16.205,16.237 C15.322,15.496 14.185,15.281 13.303,15.791 C12.428,16.289 12.047,17.373 12.246,18.5 L7.735,18.5 C7.938,17.374 7.553,16.299 6.684,15.791 C5.801,15.27 4.655,15.492 3.773,16.237 L1.5,12.285 C2.573,11.871 3.317,10.999 3.317,9.991 C3.305,8.98 2.573,8.121 1.5,7.716 L3.765,3.784 C4.645,4.516 5.794,4.738 6.687,4.232 C7.555,3.722 7.939,2.637 7.735,1.5 L12.263,1.5 C12.072,2.637 12.441,3.71 13.314,4.22 C14.206,4.73 15.343,4.516 16.225,3.794 L18.487,7.714 C17.404,8.117 16.661,8.988 16.67,10.009 C16.672,11.018 17.415,11.88 18.488,12.285 L18.488,12.285 Z\"></path></svg>";
-var comment = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M6,18.71 L6,14 L1,14 L1,1 L19,1 L19,14 L10.71,14 L6,18.71 L6,18.71 Z M2,13 L7,13 L7,16.29 L10.29,13 L18,13 L18,2 L2,2 L2,13 L2,13 Z\"></path></svg>";
-var commenting = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon fill=\"none\" stroke=\"#000\" points=\"1.5,1.5 18.5,1.5 18.5,13.5 10.5,13.5 6.5,17.5 6.5,13.5 1.5,13.5\"></polygon> <circle cx=\"10\" cy=\"8\" r=\"1\"></circle> <circle cx=\"6\" cy=\"8\" r=\"1\"></circle> <circle cx=\"14\" cy=\"8\" r=\"1\"></circle></svg>";
-var comments = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" points=\"2 0.5 19.5 0.5 19.5 13\"></polyline> <path d=\"M5,19.71 L5,15 L0,15 L0,2 L18,2 L18,15 L9.71,15 L5,19.71 L5,19.71 L5,19.71 Z M1,14 L6,14 L6,17.29 L9.29,14 L17,14 L17,3 L1,3 L1,14 L1,14 L1,14 Z\"></path></svg>";
-var copy = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect fill=\"none\" stroke=\"#000\" x=\"3.5\" y=\"2.5\" width=\"12\" height=\"16\"></rect> <polyline fill=\"none\" stroke=\"#000\" points=\"5 0.5 17.5 0.5 17.5 17\"></polyline></svg>";
-var database = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <ellipse fill=\"none\" stroke=\"#000\" cx=\"10\" cy=\"4.64\" rx=\"7.5\" ry=\"3.14\"></ellipse> <path fill=\"none\" stroke=\"#000\" d=\"M17.5,8.11 C17.5,9.85 14.14,11.25 10,11.25 C5.86,11.25 2.5,9.84 2.5,8.11\"></path> <path fill=\"none\" stroke=\"#000\" d=\"M17.5,11.25 C17.5,12.99 14.14,14.39 10,14.39 C5.86,14.39 2.5,12.98 2.5,11.25\"></path> <path fill=\"none\" stroke=\"#000\" d=\"M17.49,4.64 L17.5,14.36 C17.5,16.1 14.14,17.5 10,17.5 C5.86,17.5 2.5,16.09 2.5,14.36 L2.5,4.64\"></path></svg>";
-var desktop = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"8\" y=\"15\" width=\"1\" height=\"2\"></rect> <rect x=\"11\" y=\"15\" width=\"1\" height=\"2\"></rect> <rect x=\"5\" y=\"16\" width=\"10\" height=\"1\"></rect> <rect fill=\"none\" stroke=\"#000\" x=\"1.5\" y=\"3.5\" width=\"17\" height=\"11\"></rect></svg>";
-var download = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" points=\"14,10 9.5,14.5 5,10\"></polyline> <rect x=\"3\" y=\"17\" width=\"13\" height=\"1\"></rect> <line fill=\"none\" stroke=\"#000\" x1=\"9.5\" y1=\"13.91\" x2=\"9.5\" y2=\"3\"></line></svg>";
-var dribbble = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.4\" d=\"M1.3,8.9c0,0,5,0.1,8.6-1c1.4-0.4,2.6-0.9,4-1.9 c1.4-1.1,2.5-2.5,2.5-2.5\"></path> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.4\" d=\"M3.9,16.6c0,0,1.7-2.8,3.5-4.2 c1.8-1.3,4-2,5.7-2.2C16,10,19,10.6,19,10.6\"></path> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.4\" d=\"M6.9,1.6c0,0,3.3,4.6,4.2,6.8 c0.4,0.9,1.3,3.1,1.9,5.2c0.6,2,0.9,4.4,0.9,4.4\"></path> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.4\" cx=\"10\" cy=\"10\" r=\"9\"></circle></svg>";
-var expand = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"13 2 18 2 18 7 17 7 17 3 13 3\"></polygon> <polygon points=\"2 13 3 13 3 17 7 17 7 18 2 18\"></polygon> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M11,9 L17,3\"></path> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M3,17 L9,11\"></path></svg>";
-var facebook = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M11,10h2.6l0.4-3H11V5.3c0-0.9,0.2-1.5,1.5-1.5H14V1.1c-0.3,0-1-0.1-2.1-0.1C9.6,1,8,2.4,8,5v2H5.5v3H8v8h3V10z\"></path></svg>";
-var file = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect fill=\"none\" stroke=\"#000\" x=\"3.5\" y=\"1.5\" width=\"13\" height=\"17\"></rect></svg>";
-var flickr = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle cx=\"5.5\" cy=\"9.5\" r=\"3.5\"></circle> <circle cx=\"14.5\" cy=\"9.5\" r=\"3.5\"></circle></svg>";
-var folder = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon fill=\"none\" stroke=\"#000\" points=\"9.5 5.5 8.5 3.5 1.5 3.5 1.5 16.5 18.5 16.5 18.5 5.5\"></polygon></svg>";
-var forward = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M2.47,13.11 C4.02,10.02 6.27,7.85 9.04,6.61 C9.48,6.41 10.27,6.13 11,5.91 L11,2 L18.89,9 L11,16 L11,12.13 C9.25,12.47 7.58,13.19 6.02,14.25 C3.03,16.28 1.63,18.54 1.63,18.54 C1.63,18.54 1.38,15.28 2.47,13.11 L2.47,13.11 Z M5.3,13.53 C6.92,12.4 9.04,11.4 12,10.92 L12,13.63 L17.36,9 L12,4.25 L12,6.8 C11.71,6.86 10.86,7.02 9.67,7.49 C6.79,8.65 4.58,10.96 3.49,13.08 C3.18,13.7 2.68,14.87 2.49,16 C3.28,15.05 4.4,14.15 5.3,13.53 L5.3,13.53 Z\"></path></svg>";
-var foursquare = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M15.23,2 C15.96,2 16.4,2.41 16.5,2.86 C16.57,3.15 16.56,3.44 16.51,3.73 C16.46,4.04 14.86,11.72 14.75,12.03 C14.56,12.56 14.16,12.82 13.61,12.83 C13.03,12.84 11.09,12.51 10.69,13 C10.38,13.38 7.79,16.39 6.81,17.53 C6.61,17.76 6.4,17.96 6.08,17.99 C5.68,18.04 5.29,17.87 5.17,17.45 C5.12,17.28 5.1,17.09 5.1,16.91 C5.1,12.4 4.86,7.81 5.11,3.31 C5.17,2.5 5.81,2.12 6.53,2 L15.23,2 L15.23,2 Z M9.76,11.42 C9.94,11.19 10.17,11.1 10.45,11.1 L12.86,11.1 C13.12,11.1 13.31,10.94 13.36,10.69 C13.37,10.64 13.62,9.41 13.74,8.83 C13.81,8.52 13.53,8.28 13.27,8.28 C12.35,8.29 11.42,8.28 10.5,8.28 C9.84,8.28 9.83,7.69 9.82,7.21 C9.8,6.85 10.13,6.55 10.5,6.55 C11.59,6.56 12.67,6.55 13.76,6.55 C14.03,6.55 14.23,6.4 14.28,6.14 C14.34,5.87 14.67,4.29 14.67,4.29 C14.67,4.29 14.82,3.74 14.19,3.74 L7.34,3.74 C7,3.75 6.84,4.02 6.84,4.33 C6.84,7.58 6.85,14.95 6.85,14.99 C6.87,15 8.89,12.51 9.76,11.42 L9.76,11.42 Z\"></path></svg>";
-var future = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline points=\"19 2 18 2 18 6 14 6 14 7 19 7 19 2\"></polyline> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M18,6.548 C16.709,3.29 13.354,1 9.6,1 C4.6,1 0.6,5 0.6,10 C0.6,15 4.6,19 9.6,19 C14.6,19 18.6,15 18.6,10\"></path> <rect x=\"9\" y=\"4\" width=\"1\" height=\"7\"></rect> <path d=\"M13.018,14.197 L9.445,10.625\" fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\"></path></svg>";
-var github = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M10,1 C5.03,1 1,5.03 1,10 C1,13.98 3.58,17.35 7.16,18.54 C7.61,18.62 7.77,18.34 7.77,18.11 C7.77,17.9 7.76,17.33 7.76,16.58 C5.26,17.12 4.73,15.37 4.73,15.37 C4.32,14.33 3.73,14.05 3.73,14.05 C2.91,13.5 3.79,13.5 3.79,13.5 C4.69,13.56 5.17,14.43 5.17,14.43 C5.97,15.8 7.28,15.41 7.79,15.18 C7.87,14.6 8.1,14.2 8.36,13.98 C6.36,13.75 4.26,12.98 4.26,9.53 C4.26,8.55 4.61,7.74 5.19,7.11 C5.1,6.88 4.79,5.97 5.28,4.73 C5.28,4.73 6.04,4.49 7.75,5.65 C8.47,5.45 9.24,5.35 10,5.35 C10.76,5.35 11.53,5.45 12.25,5.65 C13.97,4.48 14.72,4.73 14.72,4.73 C15.21,5.97 14.9,6.88 14.81,7.11 C15.39,7.74 15.73,8.54 15.73,9.53 C15.73,12.99 13.63,13.75 11.62,13.97 C11.94,14.25 12.23,14.8 12.23,15.64 C12.23,16.84 12.22,17.81 12.22,18.11 C12.22,18.35 12.38,18.63 12.84,18.54 C16.42,17.35 19,13.98 19,10 C19,5.03 14.97,1 10,1 L10,1 Z\"></path></svg>";
-var gitter = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"3.5\" y=\"1\" width=\"1.531\" height=\"11.471\"></rect> <rect x=\"7.324\" y=\"4.059\" width=\"1.529\" height=\"15.294\"></rect> <rect x=\"11.148\" y=\"4.059\" width=\"1.527\" height=\"15.294\"></rect> <rect x=\"14.971\" y=\"4.059\" width=\"1.529\" height=\"8.412\"></rect></svg>";
-var google = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M17.86,9.09 C18.46,12.12 17.14,16.05 13.81,17.56 C9.45,19.53 4.13,17.68 2.47,12.87 C0.68,7.68 4.22,2.42 9.5,2.03 C11.57,1.88 13.42,2.37 15.05,3.65 C15.22,3.78 15.37,3.93 15.61,4.14 C14.9,4.81 14.23,5.45 13.5,6.14 C12.27,5.08 10.84,4.72 9.28,4.98 C8.12,5.17 7.16,5.76 6.37,6.63 C4.88,8.27 4.62,10.86 5.76,12.82 C6.95,14.87 9.17,15.8 11.57,15.25 C13.27,14.87 14.76,13.33 14.89,11.75 L10.51,11.75 L10.51,9.09 L17.86,9.09 L17.86,9.09 Z\"></path></svg>";
-var grid = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"2\" y=\"2\" width=\"3\" height=\"3\"></rect> <rect x=\"8\" y=\"2\" width=\"3\" height=\"3\"></rect> <rect x=\"14\" y=\"2\" width=\"3\" height=\"3\"></rect> <rect x=\"2\" y=\"8\" width=\"3\" height=\"3\"></rect> <rect x=\"8\" y=\"8\" width=\"3\" height=\"3\"></rect> <rect x=\"14\" y=\"8\" width=\"3\" height=\"3\"></rect> <rect x=\"2\" y=\"14\" width=\"3\" height=\"3\"></rect> <rect x=\"8\" y=\"14\" width=\"3\" height=\"3\"></rect> <rect x=\"14\" y=\"14\" width=\"3\" height=\"3\"></rect></svg>";
-var happy = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle cx=\"13\" cy=\"7\" r=\"1\"></circle> <circle cx=\"7\" cy=\"7\" r=\"1\"></circle> <circle fill=\"none\" stroke=\"#000\" cx=\"10\" cy=\"10\" r=\"8.5\"></circle> <path fill=\"none\" stroke=\"#000\" d=\"M14.6,11.4 C13.9,13.3 12.1,14.5 10,14.5 C7.9,14.5 6.1,13.3 5.4,11.4\"></path></svg>";
-var hashtag = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M15.431,8 L15.661,7 L12.911,7 L13.831,3 L12.901,3 L11.98,7 L9.29,7 L10.21,3 L9.281,3 L8.361,7 L5.23,7 L5,8 L8.13,8 L7.21,12 L4.23,12 L4,13 L6.98,13 L6.061,17 L6.991,17 L7.911,13 L10.601,13 L9.681,17 L10.611,17 L11.531,13 L14.431,13 L14.661,12 L11.76,12 L12.681,8 L15.431,8 Z M10.831,12 L8.141,12 L9.061,8 L11.75,8 L10.831,12 Z\"></path></svg>";
-var heart = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.03\" d=\"M10,4 C10,4 8.1,2 5.74,2 C3.38,2 1,3.55 1,6.73 C1,8.84 2.67,10.44 2.67,10.44 L10,18 L17.33,10.44 C17.33,10.44 19,8.84 19,6.73 C19,3.55 16.62,2 14.26,2 C11.9,2 10,4 10,4 L10,4 Z\"></path></svg>";
-var history = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"#000\" points=\"1 2 2 2 2 6 6 6 6 7 1 7 1 2\"></polyline> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M2.1,6.548 C3.391,3.29 6.746,1 10.5,1 C15.5,1 19.5,5 19.5,10 C19.5,15 15.5,19 10.5,19 C5.5,19 1.5,15 1.5,10\"></path> <rect x=\"9\" y=\"4\" width=\"1\" height=\"7\"></rect> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M13.018,14.197 L9.445,10.625\" id=\"Shape\"></path></svg>";
-var home = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"18.65 11.35 10 2.71 1.35 11.35 0.65 10.65 10 1.29 19.35 10.65\"></polygon> <polygon points=\"15 4 18 4 18 7 17 7 17 5 15 5\"></polygon> <polygon points=\"3 11 4 11 4 18 7 18 7 12 12 12 12 18 16 18 16 11 17 11 17 19 11 19 11 13 8 13 8 19 3 19\"></polygon></svg>";
-var image = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle cx=\"16.1\" cy=\"6.1\" r=\"1.1\"></circle> <rect fill=\"none\" stroke=\"#000\" x=\"0.5\" y=\"2.5\" width=\"19\" height=\"15\"></rect> <polyline fill=\"none\" stroke=\"#000\" stroke-width=\"1.01\" points=\"4,13 8,9 13,14\"></polyline> <polyline fill=\"none\" stroke=\"#000\" stroke-width=\"1.01\" points=\"11,12 12.5,10.5 16,14\"></polyline></svg>";
-var info = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M12.13,11.59 C11.97,12.84 10.35,14.12 9.1,14.16 C6.17,14.2 9.89,9.46 8.74,8.37 C9.3,8.16 10.62,7.83 10.62,8.81 C10.62,9.63 10.12,10.55 9.88,11.32 C8.66,15.16 12.13,11.15 12.14,11.18 C12.16,11.21 12.16,11.35 12.13,11.59 C12.08,11.95 12.16,11.35 12.13,11.59 L12.13,11.59 Z M11.56,5.67 C11.56,6.67 9.36,7.15 9.36,6.03 C9.36,5 11.56,4.54 11.56,5.67 L11.56,5.67 Z\"></path> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"10\" cy=\"10\" r=\"9\"></circle></svg>";
-var instagram = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M13.55,1H6.46C3.45,1,1,3.44,1,6.44v7.12c0,3,2.45,5.44,5.46,5.44h7.08c3.02,0,5.46-2.44,5.46-5.44V6.44 C19.01,3.44,16.56,1,13.55,1z M17.5,14c0,1.93-1.57,3.5-3.5,3.5H6c-1.93,0-3.5-1.57-3.5-3.5V6c0-1.93,1.57-3.5,3.5-3.5h8 c1.93,0,3.5,1.57,3.5,3.5V14z\"></path> <circle cx=\"14.87\" cy=\"5.26\" r=\"1.09\"></circle> <path d=\"M10.03,5.45c-2.55,0-4.63,2.06-4.63,4.6c0,2.55,2.07,4.61,4.63,4.61c2.56,0,4.63-2.061,4.63-4.61 C14.65,7.51,12.58,5.45,10.03,5.45L10.03,5.45L10.03,5.45z M10.08,13c-1.66,0-3-1.34-3-2.99c0-1.65,1.34-2.99,3-2.99s3,1.34,3,2.99 C13.08,11.66,11.74,13,10.08,13L10.08,13L10.08,13z\"></path></svg>";
-var italic = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M12.63,5.48 L10.15,14.52 C10,15.08 10.37,15.25 11.92,15.3 L11.72,16 L6,16 L6.2,15.31 C7.78,15.26 8.19,15.09 8.34,14.53 L10.82,5.49 C10.97,4.92 10.63,4.76 9.09,4.71 L9.28,4 L15,4 L14.81,4.69 C13.23,4.75 12.78,4.91 12.63,5.48 L12.63,5.48 Z\"></path></svg>";
-var joomla = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M7.8,13.4l1.7-1.7L5.9,8c-0.6-0.5-0.6-1.5,0-2c0.6-0.6,1.4-0.6,2,0l1.7-1.7c-1-1-2.3-1.3-3.6-1C5.8,2.2,4.8,1.4,3.7,1.4 c-1.3,0-2.3,1-2.3,2.3c0,1.1,0.8,2,1.8,2.3c-0.4,1.3-0.1,2.8,1,3.8L7.8,13.4L7.8,13.4z\"></path> <path d=\"M10.2,4.3c1-1,2.5-1.4,3.8-1c0.2-1.1,1.1-2,2.3-2c1.3,0,2.3,1,2.3,2.3c0,1.2-0.9,2.2-2,2.3c0.4,1.3,0,2.8-1,3.8L13.9,8 c0.6-0.5,0.6-1.5,0-2c-0.5-0.6-1.5-0.6-2,0L8.2,9.7L6.5,8\"></path> <path d=\"M14.1,16.8c-1.3,0.4-2.8,0.1-3.8-1l1.7-1.7c0.6,0.6,1.5,0.6,2,0c0.5-0.6,0.6-1.5,0-2l-3.7-3.7L12,6.7l3.7,3.7 c1,1,1.3,2.4,1,3.6c1.1,0.2,2,1.1,2,2.3c0,1.3-1,2.3-2.3,2.3C15.2,18.6,14.3,17.8,14.1,16.8\"></path> <path d=\"M13.2,12.2l-3.7,3.7c-1,1-2.4,1.3-3.6,1c-0.2,1-1.2,1.8-2.2,1.8c-1.3,0-2.3-1-2.3-2.3c0-1.1,0.8-2,1.8-2.3 c-0.3-1.3,0-2.7,1-3.7l1.7,1.7c-0.6,0.6-0.6,1.5,0,2c0.6,0.6,1.4,0.6,2,0l3.7-3.7\"></path></svg>";
-var laptop = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect y=\"16\" width=\"20\" height=\"1\"></rect> <rect fill=\"none\" stroke=\"#000\" x=\"2.5\" y=\"4.5\" width=\"15\" height=\"10\"></rect></svg>";
-var lifesaver = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M10,0.5 C4.76,0.5 0.5,4.76 0.5,10 C0.5,15.24 4.76,19.5 10,19.5 C15.24,19.5 19.5,15.24 19.5,10 C19.5,4.76 15.24,0.5 10,0.5 L10,0.5 Z M10,1.5 C11.49,1.5 12.89,1.88 14.11,2.56 L11.85,4.82 C11.27,4.61 10.65,4.5 10,4.5 C9.21,4.5 8.47,4.67 7.79,4.96 L5.58,2.75 C6.87,1.95 8.38,1.5 10,1.5 L10,1.5 Z M4.96,7.8 C4.67,8.48 4.5,9.21 4.5,10 C4.5,10.65 4.61,11.27 4.83,11.85 L2.56,14.11 C1.88,12.89 1.5,11.49 1.5,10 C1.5,8.38 1.95,6.87 2.75,5.58 L4.96,7.79 L4.96,7.8 L4.96,7.8 Z M10,18.5 C8.25,18.5 6.62,17.97 5.27,17.06 L7.46,14.87 C8.22,15.27 9.08,15.5 10,15.5 C10.79,15.5 11.53,15.33 12.21,15.04 L14.42,17.25 C13.13,18.05 11.62,18.5 10,18.5 L10,18.5 Z M10,14.5 C7.52,14.5 5.5,12.48 5.5,10 C5.5,7.52 7.52,5.5 10,5.5 C12.48,5.5 14.5,7.52 14.5,10 C14.5,12.48 12.48,14.5 10,14.5 L10,14.5 Z M15.04,12.21 C15.33,11.53 15.5,10.79 15.5,10 C15.5,9.08 15.27,8.22 14.87,7.46 L17.06,5.27 C17.97,6.62 18.5,8.25 18.5,10 C18.5,11.62 18.05,13.13 17.25,14.42 L15.04,12.21 L15.04,12.21 Z\"></path></svg>";
-var link = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375\"></path> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375\"></path> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M7.925,11.875 L11.925,7.975\"></path></svg>";
-var linkedin = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M5.77,17.89 L5.77,7.17 L2.21,7.17 L2.21,17.89 L5.77,17.89 L5.77,17.89 Z M3.99,5.71 C5.23,5.71 6.01,4.89 6.01,3.86 C5.99,2.8 5.24,2 4.02,2 C2.8,2 2,2.8 2,3.85 C2,4.88 2.77,5.7 3.97,5.7 L3.99,5.7 L3.99,5.71 L3.99,5.71 Z\"></path> <path d=\"M7.75,17.89 L11.31,17.89 L11.31,11.9 C11.31,11.58 11.33,11.26 11.43,11.03 C11.69,10.39 12.27,9.73 13.26,9.73 C14.55,9.73 15.06,10.71 15.06,12.15 L15.06,17.89 L18.62,17.89 L18.62,11.74 C18.62,8.45 16.86,6.92 14.52,6.92 C12.6,6.92 11.75,7.99 11.28,8.73 L11.3,8.73 L11.3,7.17 L7.75,7.17 C7.79,8.17 7.75,17.89 7.75,17.89 L7.75,17.89 L7.75,17.89 Z\"></path></svg>";
-var list = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"6\" y=\"4\" width=\"12\" height=\"1\"></rect> <rect x=\"6\" y=\"9\" width=\"12\" height=\"1\"></rect> <rect x=\"6\" y=\"14\" width=\"12\" height=\"1\"></rect> <rect x=\"2\" y=\"4\" width=\"2\" height=\"1\"></rect> <rect x=\"2\" y=\"9\" width=\"2\" height=\"1\"></rect> <rect x=\"2\" y=\"14\" width=\"2\" height=\"1\"></rect></svg>";
-var location = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.01\" d=\"M10,0.5 C6.41,0.5 3.5,3.39 3.5,6.98 C3.5,11.83 10,19 10,19 C10,19 16.5,11.83 16.5,6.98 C16.5,3.39 13.59,0.5 10,0.5 L10,0.5 Z\"></path> <circle fill=\"none\" stroke=\"#000\" cx=\"10\" cy=\"6.8\" r=\"2.3\"></circle></svg>";
-var lock = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect fill=\"none\" stroke=\"#000\" height=\"10\" width=\"13\" y=\"8.5\" x=\"3.5\"></rect> <path fill=\"none\" stroke=\"#000\" d=\"M6.5,8 L6.5,4.88 C6.5,3.01 8.07,1.5 10,1.5 C11.93,1.5 13.5,3.01 13.5,4.88 L13.5,8\"></path></svg>";
-var mail = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" points=\"1.4,6.5 10,11 18.6,6.5\"></polyline> <path d=\"M 1,4 1,16 19,16 19,4 1,4 Z M 18,15 2,15 2,5 18,5 18,15 Z\"></path></svg>";
-var menu = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"2\" y=\"4\" width=\"16\" height=\"1\"></rect> <rect x=\"2\" y=\"9\" width=\"16\" height=\"1\"></rect> <rect x=\"2\" y=\"14\" width=\"16\" height=\"1\"></rect></svg>";
-var minus = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect height=\"1\" width=\"18\" y=\"9\" x=\"1\"></rect></svg>";
-var more = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle cx=\"3\" cy=\"10\" r=\"2\"></circle> <circle cx=\"10\" cy=\"10\" r=\"2\"></circle> <circle cx=\"17\" cy=\"10\" r=\"2\"></circle></svg>";
-var move = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"4,5 1,5 1,9 2,9 2,6 4,6 \"></polygon> <polygon points=\"1,16 2,16 2,18 4,18 4,19 1,19 \"></polygon> <polygon points=\"14,16 14,19 11,19 11,18 13,18 13,16 \"></polygon> <rect fill=\"none\" stroke=\"#000\" x=\"5.5\" y=\"1.5\" width=\"13\" height=\"13\"></rect> <rect x=\"1\" y=\"11\" width=\"1\" height=\"3\"></rect> <rect x=\"6\" y=\"18\" width=\"3\" height=\"1\"></rect></svg>";
-var nut = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon fill=\"none\" stroke=\"#000\" points=\"2.5,5.7 10,1.3 17.5,5.7 17.5,14.3 10,18.7 2.5,14.3\"></polygon> <circle fill=\"none\" stroke=\"#000\" cx=\"10\" cy=\"10\" r=\"3.5\"></circle></svg>";
-var pagekit = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"3,1 17,1 17,16 10,16 10,13 14,13 14,4 6,4 6,16 10,16 10,19 3,19 \"></polygon></svg>";
-var pencil = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" d=\"M17.25,6.01 L7.12,16.1 L3.82,17.2 L5.02,13.9 L15.12,3.88 C15.71,3.29 16.66,3.29 17.25,3.88 C17.83,4.47 17.83,5.42 17.25,6.01 L17.25,6.01 Z\"></path> <path fill=\"none\" stroke=\"#000\" d=\"M15.98,7.268 L13.851,5.148\"></path></svg>";
-var phone = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" d=\"M15.5,17 C15.5,17.8 14.8,18.5 14,18.5 L7,18.5 C6.2,18.5 5.5,17.8 5.5,17 L5.5,3 C5.5,2.2 6.2,1.5 7,1.5 L14,1.5 C14.8,1.5 15.5,2.2 15.5,3 L15.5,17 L15.5,17 L15.5,17 Z\"></path> <circle cx=\"10.5\" cy=\"16.5\" r=\"0.8\"></circle></svg>";
-var pinterest = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M10.21,1 C5.5,1 3,4.16 3,7.61 C3,9.21 3.85,11.2 5.22,11.84 C5.43,11.94 5.54,11.89 5.58,11.69 C5.62,11.54 5.8,10.8 5.88,10.45 C5.91,10.34 5.89,10.24 5.8,10.14 C5.36,9.59 5,8.58 5,7.65 C5,5.24 6.82,2.91 9.93,2.91 C12.61,2.91 14.49,4.74 14.49,7.35 C14.49,10.3 13,12.35 11.06,12.35 C9.99,12.35 9.19,11.47 9.44,10.38 C9.75,9.08 10.35,7.68 10.35,6.75 C10.35,5.91 9.9,5.21 8.97,5.21 C7.87,5.21 6.99,6.34 6.99,7.86 C6.99,8.83 7.32,9.48 7.32,9.48 C7.32,9.48 6.24,14.06 6.04,14.91 C5.7,16.35 6.08,18.7 6.12,18.9 C6.14,19.01 6.26,19.05 6.33,18.95 C6.44,18.81 7.74,16.85 8.11,15.44 C8.24,14.93 8.79,12.84 8.79,12.84 C9.15,13.52 10.19,14.09 11.29,14.09 C14.58,14.09 16.96,11.06 16.96,7.3 C16.94,3.7 14,1 10.21,1\"></path></svg>";
-var play = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon fill=\"none\" stroke=\"#000\" points=\"6.5,5 14.5,10 6.5,15\"></polygon></svg>";
-var plus = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"9\" y=\"1\" width=\"1\" height=\"17\"></rect> <rect x=\"1\" y=\"9\" width=\"17\" height=\"1\"></rect></svg>";
-var pull = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"6.85,8 9.5,10.6 12.15,8 12.85,8.7 9.5,12 6.15,8.7\"></polygon> <line fill=\"none\" stroke=\"#000\" x1=\"9.5\" y1=\"11\" x2=\"9.5\" y2=\"2\"></line> <polyline fill=\"none\" stroke=\"#000\" points=\"6,5.5 3.5,5.5 3.5,18.5 15.5,18.5 15.5,5.5 13,5.5\"></polyline></svg>";
-var push = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"12.15,4 9.5,1.4 6.85,4 6.15,3.3 9.5,0 12.85,3.3\"></polygon> <line fill=\"none\" stroke=\"#000\" x1=\"9.5\" y1=\"10\" x2=\"9.5\" y2=\"1\"></line> <polyline fill=\"none\" stroke=\"#000\" points=\"6 5.5 3.5 5.5 3.5 18.5 15.5 18.5 15.5 5.5 13 5.5\"></polyline></svg>";
-var question = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"10\" cy=\"10\" r=\"9\"></circle> <circle cx=\"10.44\" cy=\"14.42\" r=\"1.05\"></circle> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" d=\"M8.17,7.79 C8.17,4.75 12.72,4.73 12.72,7.72 C12.72,8.67 11.81,9.15 11.23,9.75 C10.75,10.24 10.51,10.73 10.45,11.4 C10.44,11.53 10.43,11.64 10.43,11.75\"></path></svg>";
-var receiver = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.01\" d=\"M6.189,13.611C8.134,15.525 11.097,18.239 13.867,18.257C16.47,18.275 18.2,16.241 18.2,16.241L14.509,12.551L11.539,13.639L6.189,8.29L7.313,5.355L3.76,1.8C3.76,1.8 1.732,3.537 1.7,6.092C1.667,8.809 4.347,11.738 6.189,13.611\"></path></svg>";
-var refresh = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M17.08,11.15 C17.09,11.31 17.1,11.47 17.1,11.64 C17.1,15.53 13.94,18.69 10.05,18.69 C6.16,18.68 3,15.53 3,11.63 C3,7.74 6.16,4.58 10.05,4.58 C10.9,4.58 11.71,4.73 12.46,5\"></path> <polyline fill=\"none\" stroke=\"#000\" points=\"9.9 2 12.79 4.89 9.79 7.9\"></polyline></svg>";
-var reply = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M17.7,13.11 C16.12,10.02 13.84,7.85 11.02,6.61 C10.57,6.41 9.75,6.13 9,5.91 L9,2 L1,9 L9,16 L9,12.13 C10.78,12.47 12.5,13.19 14.09,14.25 C17.13,16.28 18.56,18.54 18.56,18.54 C18.56,18.54 18.81,15.28 17.7,13.11 L17.7,13.11 Z M14.82,13.53 C13.17,12.4 11.01,11.4 8,10.92 L8,13.63 L2.55,9 L8,4.25 L8,6.8 C8.3,6.86 9.16,7.02 10.37,7.49 C13.3,8.65 15.54,10.96 16.65,13.08 C16.97,13.7 17.48,14.86 17.68,16 C16.87,15.05 15.73,14.15 14.82,13.53 L14.82,13.53 Z\"></path></svg>";
-var rss = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle cx=\"3.12\" cy=\"16.8\" r=\"1.85\"></circle> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M1.5,8.2 C1.78,8.18 2.06,8.16 2.35,8.16 C7.57,8.16 11.81,12.37 11.81,17.57 C11.81,17.89 11.79,18.19 11.76,18.5\"></path> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M1.5,2.52 C1.78,2.51 2.06,2.5 2.35,2.5 C10.72,2.5 17.5,9.24 17.5,17.57 C17.5,17.89 17.49,18.19 17.47,18.5\"></path></svg>";
-var search = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"9\" cy=\"9\" r=\"7\"></circle> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M14,14 L18,18 L14,14 Z\"></path></svg>";
-var server = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"3\" y=\"3\" width=\"1\" height=\"2\"></rect> <rect x=\"5\" y=\"3\" width=\"1\" height=\"2\"></rect> <rect x=\"7\" y=\"3\" width=\"1\" height=\"2\"></rect> <rect x=\"16\" y=\"3\" width=\"1\" height=\"1\"></rect> <rect x=\"16\" y=\"10\" width=\"1\" height=\"1\"></rect> <circle fill=\"none\" stroke=\"#000\" cx=\"9.9\" cy=\"17.4\" r=\"1.4\"></circle> <rect x=\"3\" y=\"10\" width=\"1\" height=\"2\"></rect> <rect x=\"5\" y=\"10\" width=\"1\" height=\"2\"></rect> <rect x=\"9.5\" y=\"14\" width=\"1\" height=\"2\"></rect> <rect x=\"3\" y=\"17\" width=\"6\" height=\"1\"></rect> <rect x=\"11\" y=\"17\" width=\"6\" height=\"1\"></rect> <rect fill=\"none\" stroke=\"#000\" x=\"1.5\" y=\"1.5\" width=\"17\" height=\"5\"></rect> <rect fill=\"none\" stroke=\"#000\" x=\"1.5\" y=\"8.5\" width=\"17\" height=\"5\"></rect></svg>";
-var settings = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <ellipse fill=\"none\" stroke=\"#000\" cx=\"6.11\" cy=\"3.55\" rx=\"2.11\" ry=\"2.15\"></ellipse> <ellipse fill=\"none\" stroke=\"#000\" cx=\"6.11\" cy=\"15.55\" rx=\"2.11\" ry=\"2.15\"></ellipse> <circle fill=\"none\" stroke=\"#000\" cx=\"13.15\" cy=\"9.55\" r=\"2.15\"></circle> <rect x=\"1\" y=\"3\" width=\"3\" height=\"1\"></rect> <rect x=\"10\" y=\"3\" width=\"8\" height=\"1\"></rect> <rect x=\"1\" y=\"9\" width=\"8\" height=\"1\"></rect> <rect x=\"15\" y=\"9\" width=\"3\" height=\"1\"></rect> <rect x=\"1\" y=\"15\" width=\"3\" height=\"1\"></rect> <rect x=\"10\" y=\"15\" width=\"8\" height=\"1\"></rect></svg>";
-var shrink = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"11 4 12 4 12 8 16 8 16 9 11 9\"></polygon> <polygon points=\"4 11 9 11 9 16 8 16 8 12 4 12\"></polygon> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M12,8 L18,2\"></path> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M2,18 L8,12\"></path></svg>";
-var social = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <line fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" x1=\"13.4\" y1=\"14\" x2=\"6.3\" y2=\"10.7\"></line> <line fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" x1=\"13.5\" y1=\"5.5\" x2=\"6.5\" y2=\"8.8\"></line> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"15.5\" cy=\"4.6\" r=\"2.3\"></circle> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"15.5\" cy=\"14.8\" r=\"2.3\"></circle> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"4.5\" cy=\"9.8\" r=\"2.3\"></circle></svg>";
-var soundcloud = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M17.2,9.4c-0.4,0-0.8,0.1-1.101,0.2c-0.199-2.5-2.399-4.5-5-4.5c-0.6,0-1.2,0.1-1.7,0.3C9.2,5.5,9.1,5.6,9.1,5.6V15h8 c1.601,0,2.801-1.2,2.801-2.8C20,10.7,18.7,9.4,17.2,9.4L17.2,9.4z\"></path> <rect x=\"6\" y=\"6.5\" width=\"1.5\" height=\"8.5\"></rect> <rect x=\"3\" y=\"8\" width=\"1.5\" height=\"7\"></rect> <rect y=\"10\" width=\"1.5\" height=\"5\"></rect></svg>";
-var star = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon fill=\"none\" stroke=\"#000\" stroke-width=\"1.01\" points=\"10 2 12.63 7.27 18.5 8.12 14.25 12.22 15.25 18 10 15.27 4.75 18 5.75 12.22 1.5 8.12 7.37 7.27\"></polygon></svg>";
-var strikethrough = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M6,13.02 L6.65,13.02 C7.64,15.16 8.86,16.12 10.41,16.12 C12.22,16.12 12.92,14.93 12.92,13.89 C12.92,12.55 11.99,12.03 9.74,11.23 C8.05,10.64 6.23,10.11 6.23,7.83 C6.23,5.5 8.09,4.09 10.4,4.09 C11.44,4.09 12.13,4.31 12.72,4.54 L13.33,4 L13.81,4 L13.81,7.59 L13.16,7.59 C12.55,5.88 11.52,4.89 10.07,4.89 C8.84,4.89 7.89,5.69 7.89,7.03 C7.89,8.29 8.89,8.78 10.88,9.45 C12.57,10.03 14.38,10.6 14.38,12.91 C14.38,14.75 13.27,16.93 10.18,16.93 C9.18,16.93 8.17,16.69 7.46,16.39 L6.52,17 L6,17 L6,13.02 L6,13.02 Z\"></path> <rect x=\"3\" y=\"10\" width=\"15\" height=\"1\"></rect></svg>";
-var table = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"1\" y=\"3\" width=\"18\" height=\"1\"></rect> <rect x=\"1\" y=\"7\" width=\"18\" height=\"1\"></rect> <rect x=\"1\" y=\"11\" width=\"18\" height=\"1\"></rect> <rect x=\"1\" y=\"15\" width=\"18\" height=\"1\"></rect></svg>";
-var tablet = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" d=\"M5,18.5 C4.2,18.5 3.5,17.8 3.5,17 L3.5,3 C3.5,2.2 4.2,1.5 5,1.5 L16,1.5 C16.8,1.5 17.5,2.2 17.5,3 L17.5,17 C17.5,17.8 16.8,18.5 16,18.5 L5,18.5 L5,18.5 L5,18.5 Z\"></path> <circle cx=\"10.5\" cy=\"16.3\" r=\"0.8\"></circle></svg>";
-var tag = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M17.5,3.71 L17.5,7.72 C17.5,7.96 17.4,8.2 17.21,8.39 L8.39,17.2 C7.99,17.6 7.33,17.6 6.93,17.2 L2.8,13.07 C2.4,12.67 2.4,12.01 2.8,11.61 L11.61,2.8 C11.81,2.6 12.08,2.5 12.34,2.5 L16.19,2.5 C16.52,2.5 16.86,2.63 17.11,2.88 C17.35,3.11 17.48,3.4 17.5,3.71 L17.5,3.71 Z\"></path> <circle cx=\"14\" cy=\"6\" r=\"1\"></circle></svg>";
-var thumbnails = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect fill=\"none\" stroke=\"#000\" x=\"3.5\" y=\"3.5\" width=\"5\" height=\"5\"></rect> <rect fill=\"none\" stroke=\"#000\" x=\"11.5\" y=\"3.5\" width=\"5\" height=\"5\"></rect> <rect fill=\"none\" stroke=\"#000\" x=\"11.5\" y=\"11.5\" width=\"5\" height=\"5\"></rect> <rect fill=\"none\" stroke=\"#000\" x=\"3.5\" y=\"11.5\" width=\"5\" height=\"5\"></rect></svg>";
-var trash = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" points=\"6.5 3 6.5 1.5 13.5 1.5 13.5 3\"></polyline> <polyline fill=\"none\" stroke=\"#000\" points=\"4.5 4 4.5 18.5 15.5 18.5 15.5 4\"></polyline> <rect x=\"8\" y=\"7\" width=\"1\" height=\"9\"></rect> <rect x=\"11\" y=\"7\" width=\"1\" height=\"9\"></rect> <rect x=\"2\" y=\"3\" width=\"16\" height=\"1\"></rect></svg>";
-var tripadvisor = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M19.021,7.866C19.256,6.862,20,5.854,20,5.854h-3.346C14.781,4.641,12.504,4,9.98,4C7.363,4,4.999,4.651,3.135,5.876H0\tc0,0,0.738,0.987,0.976,1.988c-0.611,0.837-0.973,1.852-0.973,2.964c0,2.763,2.249,5.009,5.011,5.009\tc1.576,0,2.976-0.737,3.901-1.879l1.063,1.599l1.075-1.615c0.475,0.611,1.1,1.111,1.838,1.451c1.213,0.547,2.574,0.612,3.825,0.15\tc2.589-0.963,3.913-3.852,2.964-6.439c-0.175-0.463-0.4-0.876-0.675-1.238H19.021z M16.38,14.594\tc-1.002,0.371-2.088,0.328-3.06-0.119c-0.688-0.317-1.252-0.817-1.657-1.438c-0.164-0.25-0.313-0.52-0.417-0.811\tc-0.124-0.328-0.186-0.668-0.217-1.014c-0.063-0.689,0.037-1.396,0.339-2.043c0.448-0.971,1.251-1.71,2.25-2.079\tc2.075-0.765,4.375,0.3,5.14,2.366c0.762,2.066-0.301,4.37-2.363,5.134L16.38,14.594L16.38,14.594z M8.322,13.066\tc-0.72,1.059-1.935,1.76-3.309,1.76c-2.207,0-4.001-1.797-4.001-3.996c0-2.203,1.795-4.002,4.001-4.002\tc2.204,0,3.999,1.8,3.999,4.002c0,0.137-0.024,0.261-0.04,0.396c-0.067,0.678-0.284,1.313-0.648,1.853v-0.013H8.322z M2.472,10.775\tc0,1.367,1.112,2.479,2.476,2.479c1.363,0,2.472-1.11,2.472-2.479c0-1.359-1.11-2.468-2.472-2.468\tC3.584,8.306,2.473,9.416,2.472,10.775L2.472,10.775z M12.514,10.775c0,1.367,1.104,2.479,2.471,2.479\tc1.363,0,2.474-1.108,2.474-2.479c0-1.359-1.11-2.468-2.474-2.468c-1.364,0-2.477,1.109-2.477,2.468H12.514z M3.324,10.775\tc0-0.893,0.726-1.618,1.614-1.618c0.889,0,1.625,0.727,1.625,1.618c0,0.898-0.725,1.627-1.625,1.627\tc-0.901,0-1.625-0.729-1.625-1.627H3.324z M13.354,10.775c0-0.893,0.726-1.618,1.627-1.618c0.886,0,1.61,0.727,1.61,1.618\tc0,0.898-0.726,1.627-1.626,1.627s-1.625-0.729-1.625-1.627H13.354z M9.977,4.875c1.798,0,3.425,0.324,4.849,0.968\tc-0.535,0.015-1.061,0.108-1.586,0.3c-1.264,0.463-2.264,1.388-2.815,2.604c-0.262,0.551-0.398,1.133-0.448,1.72\tC9.79,7.905,7.677,5.873,5.076,5.82C6.501,5.208,8.153,4.875,9.94,4.875H9.977z\"></path></svg>";
-var tumblr = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M6.885,8.598c0,0,0,3.393,0,4.996c0,0.282,0,0.66,0.094,0.942c0.377,1.509,1.131,2.545,2.545,3.11 c1.319,0.472,2.356,0.472,3.676,0c0.565-0.188,1.132-0.659,1.132-0.659l-0.849-2.263c0,0-1.036,0.378-1.603,0.283 c-0.565-0.094-1.226-0.66-1.226-1.508c0-1.603,0-4.902,0-4.902h2.828V5.771h-2.828V2H8.205c0,0-0.094,0.66-0.188,0.942 C7.828,3.791,7.262,4.733,6.603,5.394C5.848,6.147,5,6.43,5,6.43v2.168H6.885z\"></path></svg>";
-var tv = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"7\" y=\"16\" width=\"6\" height=\"1\"></rect> <rect fill=\"none\" stroke=\"#000\" x=\"0.5\" y=\"3.5\" width=\"19\" height=\"11\"></rect></svg>";
-var twitter = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M19,4.74 C18.339,5.029 17.626,5.229 16.881,5.32 C17.644,4.86 18.227,4.139 18.503,3.28 C17.79,3.7 17.001,4.009 16.159,4.17 C15.485,3.45 14.526,3 13.464,3 C11.423,3 9.771,4.66 9.771,6.7 C9.771,6.99 9.804,7.269 9.868,7.539 C6.795,7.38 4.076,5.919 2.254,3.679 C1.936,4.219 1.754,4.86 1.754,5.539 C1.754,6.82 2.405,7.95 3.397,8.61 C2.79,8.589 2.22,8.429 1.723,8.149 L1.723,8.189 C1.723,9.978 2.997,11.478 4.686,11.82 C4.376,11.899 4.049,11.939 3.713,11.939 C3.475,11.939 3.245,11.919 3.018,11.88 C3.49,13.349 4.852,14.419 6.469,14.449 C5.205,15.429 3.612,16.019 1.882,16.019 C1.583,16.019 1.29,16.009 1,15.969 C2.635,17.019 4.576,17.629 6.662,17.629 C13.454,17.629 17.17,12 17.17,7.129 C17.17,6.969 17.166,6.809 17.157,6.649 C17.879,6.129 18.504,5.478 19,4.74\"></path></svg>";
-var uikit = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"14.4,3.1 11.3,5.1 15,7.3 15,12.9 10,15.7 5,12.9 5,8.5 2,6.8 2,14.8 9.9,19.5 18,14.8 18,5.3\"></polygon> <polygon points=\"9.8,4.2 6.7,2.4 9.8,0.4 12.9,2.3\"></polygon></svg>";
-var unlock = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect fill=\"none\" stroke=\"#000\" x=\"3.5\" y=\"8.5\" width=\"13\" height=\"10\"></rect> <path fill=\"none\" stroke=\"#000\" d=\"M6.5,8.5 L6.5,4.9 C6.5,3 8.1,1.5 10,1.5 C11.9,1.5 13.5,3 13.5,4.9\"></path></svg>";
-var upload = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" points=\"5 8 9.5 3.5 14 8 \"></polyline> <rect x=\"3\" y=\"17\" width=\"13\" height=\"1\"></rect> <line fill=\"none\" stroke=\"#000\" x1=\"9.5\" y1=\"15\" x2=\"9.5\" y2=\"4\"></line></svg>";
-var user = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"9.9\" cy=\"6.4\" r=\"4.4\"></circle> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2\"></path></svg>";
-var users = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"7.7\" cy=\"8.6\" r=\"3.5\"></circle> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M1,18.1 C1.7,14.6 4.4,12.1 7.6,12.1 C10.9,12.1 13.7,14.8 14.3,18.3\"></path> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M11.4,4 C12.8,2.4 15.4,2.8 16.3,4.7 C17.2,6.6 15.7,8.9 13.6,8.9 C16.5,8.9 18.8,11.3 19.2,14.1\"></path></svg>";
-var vimeo = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M2.065,7.59C1.84,7.367,1.654,7.082,1.468,6.838c-0.332-0.42-0.137-0.411,0.274-0.772c1.026-0.91,2.004-1.896,3.127-2.688 c1.017-0.713,2.365-1.173,3.286-0.039c0.849,1.045,0.869,2.629,1.084,3.891c0.215,1.309,0.421,2.648,0.88,3.901 c0.127,0.352,0.37,1.018,0.81,1.074c0.567,0.078,1.145-0.917,1.408-1.289c0.684-0.987,1.611-2.317,1.494-3.587 c-0.115-1.349-1.572-1.095-2.482-0.773c0.146-1.514,1.555-3.216,2.912-3.792c1.439-0.597,3.579-0.587,4.302,1.036 c0.772,1.759,0.078,3.802-0.763,5.396c-0.918,1.731-2.1,3.333-3.363,4.829c-1.114,1.329-2.432,2.787-4.093,3.422 c-1.897,0.723-3.021-0.686-3.667-2.318c-0.705-1.777-1.056-3.771-1.565-5.621C4.898,8.726,4.644,7.836,4.136,7.191 C3.473,6.358,2.72,7.141,2.065,7.59C1.977,7.502,2.115,7.551,2.065,7.59L2.065,7.59z\"></path></svg>";
-var warning = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle cx=\"10\" cy=\"14\" r=\"1\"></circle> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"10\" cy=\"10\" r=\"9\"></circle> <path d=\"M10.97,7.72 C10.85,9.54 10.56,11.29 10.56,11.29 C10.51,11.87 10.27,12 9.99,12 C9.69,12 9.49,11.87 9.43,11.29 C9.43,11.29 9.16,9.54 9.03,7.72 C8.96,6.54 9.03,6 9.03,6 C9.03,5.45 9.46,5.02 9.99,5 C10.53,5.01 10.97,5.44 10.97,6 C10.97,6 11.04,6.54 10.97,7.72 L10.97,7.72 Z\"></path></svg>";
-var whatsapp = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M16.7,3.3c-1.8-1.8-4.1-2.8-6.7-2.8c-5.2,0-9.4,4.2-9.4,9.4c0,1.7,0.4,3.3,1.3,4.7l-1.3,4.9l5-1.3c1.4,0.8,2.9,1.2,4.5,1.2 l0,0l0,0c5.2,0,9.4-4.2,9.4-9.4C19.5,7.4,18.5,5,16.7,3.3 M10.1,17.7L10.1,17.7c-1.4,0-2.8-0.4-4-1.1l-0.3-0.2l-3,0.8l0.8-2.9 l-0.2-0.3c-0.8-1.2-1.2-2.7-1.2-4.2c0-4.3,3.5-7.8,7.8-7.8c2.1,0,4.1,0.8,5.5,2.3c1.5,1.5,2.3,3.4,2.3,5.5 C17.9,14.2,14.4,17.7,10.1,17.7 M14.4,11.9c-0.2-0.1-1.4-0.7-1.6-0.8c-0.2-0.1-0.4-0.1-0.5,0.1c-0.2,0.2-0.6,0.8-0.8,0.9 c-0.1,0.2-0.3,0.2-0.5,0.1c-0.2-0.1-1-0.4-1.9-1.2c-0.7-0.6-1.2-1.4-1.3-1.6c-0.1-0.2,0-0.4,0.1-0.5C8,8.8,8.1,8.7,8.2,8.5 c0.1-0.1,0.2-0.2,0.2-0.4c0.1-0.2,0-0.3,0-0.4C8.4,7.6,7.9,6.5,7.7,6C7.5,5.5,7.3,5.6,7.2,5.6c-0.1,0-0.3,0-0.4,0 c-0.2,0-0.4,0.1-0.6,0.3c-0.2,0.2-0.8,0.8-0.8,2c0,1.2,0.8,2.3,1,2.4c0.1,0.2,1.7,2.5,4,3.5c0.6,0.2,1,0.4,1.3,0.5 c0.6,0.2,1.1,0.2,1.5,0.1c0.5-0.1,1.4-0.6,1.6-1.1c0.2-0.5,0.2-1,0.1-1.1C14.8,12.1,14.6,12,14.4,11.9\"></path></svg>";
-var wordpress = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M10,0.5c-5.2,0-9.5,4.3-9.5,9.5s4.3,9.5,9.5,9.5c5.2,0,9.5-4.3,9.5-9.5S15.2,0.5,10,0.5L10,0.5L10,0.5z M15.6,3.9h-0.1 c-0.8,0-1.4,0.7-1.4,1.5c0,0.7,0.4,1.3,0.8,1.9c0.3,0.6,0.7,1.3,0.7,2.3c0,0.7-0.3,1.5-0.6,2.7L14.1,15l-3-8.9 c0.5,0,0.9-0.1,0.9-0.1C12.5,6,12.5,5.3,12,5.4c0,0-1.3,0.1-2.2,0.1C9,5.5,7.7,5.4,7.7,5.4C7.2,5.3,7.2,6,7.6,6c0,0,0.4,0.1,0.9,0.1 l1.3,3.5L8,15L5,6.1C5.5,6.1,5.9,6,5.9,6C6.4,6,6.3,5.3,5.9,5.4c0,0-1.3,0.1-2.2,0.1c-0.2,0-0.3,0-0.5,0c1.5-2.2,4-3.7,6.9-3.7 C12.2,1.7,14.1,2.6,15.6,3.9L15.6,3.9L15.6,3.9z M2.5,6.6l3.9,10.8c-2.7-1.3-4.6-4.2-4.6-7.4C1.8,8.8,2,7.6,2.5,6.6L2.5,6.6L2.5,6.6 z M10.2,10.7l2.5,6.9c0,0,0,0.1,0.1,0.1C11.9,18,11,18.2,10,18.2c-0.8,0-1.6-0.1-2.3-0.3L10.2,10.7L10.2,10.7L10.2,10.7z M14.2,17.1 l2.5-7.3c0.5-1.2,0.6-2.1,0.6-2.9c0-0.3,0-0.6-0.1-0.8c0.6,1.2,1,2.5,1,4C18.3,13,16.6,15.7,14.2,17.1L14.2,17.1L14.2,17.1z\"></path></svg>";
-var world = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" d=\"M1,10.5 L19,10.5\"></path> <path fill=\"none\" stroke=\"#000\" d=\"M2.35,15.5 L17.65,15.5\"></path> <path fill=\"none\" stroke=\"#000\" d=\"M2.35,5.5 L17.523,5.5\"></path> <path fill=\"none\" stroke=\"#000\" d=\"M10,19.46 L9.98,19.46 C7.31,17.33 5.61,14.141 5.61,10.58 C5.61,7.02 7.33,3.83 10,1.7 C10.01,1.7 9.99,1.7 10,1.7 L10,1.7 C12.67,3.83 14.4,7.02 14.4,10.58 C14.4,14.141 12.67,17.33 10,19.46 L10,19.46 L10,19.46 L10,19.46 Z\"></path> <circle fill=\"none\" stroke=\"#000\" cx=\"10\" cy=\"10.5\" r=\"9\"></circle></svg>";
-var xing = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M4.4,4.56 C4.24,4.56 4.11,4.61 4.05,4.72 C3.98,4.83 3.99,4.97 4.07,5.12 L5.82,8.16 L5.82,8.17 L3.06,13.04 C2.99,13.18 2.99,13.33 3.06,13.44 C3.12,13.55 3.24,13.62 3.4,13.62 L6,13.62 C6.39,13.62 6.57,13.36 6.71,13.12 C6.71,13.12 9.41,8.35 9.51,8.16 C9.49,8.14 7.72,5.04 7.72,5.04 C7.58,4.81 7.39,4.56 6.99,4.56 L4.4,4.56 L4.4,4.56 Z\"></path> <path d=\"M15.3,1 C14.91,1 14.74,1.25 14.6,1.5 C14.6,1.5 9.01,11.42 8.82,11.74 C8.83,11.76 12.51,18.51 12.51,18.51 C12.64,18.74 12.84,19 13.23,19 L15.82,19 C15.98,19 16.1,18.94 16.16,18.83 C16.23,18.72 16.23,18.57 16.16,18.43 L12.5,11.74 L12.5,11.72 L18.25,1.56 C18.32,1.42 18.32,1.27 18.25,1.16 C18.21,1.06 18.08,1 17.93,1 L15.3,1 L15.3,1 Z\"></path></svg>";
-var yelp = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M17.175,14.971c-0.112,0.77-1.686,2.767-2.406,3.054c-0.246,0.1-0.487,0.076-0.675-0.069\tc-0.122-0.096-2.446-3.859-2.446-3.859c-0.194-0.293-0.157-0.682,0.083-0.978c0.234-0.284,0.581-0.393,0.881-0.276\tc0.016,0.01,4.21,1.394,4.332,1.482c0.178,0.148,0.263,0.379,0.225,0.646L17.175,14.971L17.175,14.971z M11.464,10.789\tc-0.203-0.307-0.199-0.666,0.009-0.916c0,0,2.625-3.574,2.745-3.657c0.203-0.135,0.452-0.141,0.69-0.025\tc0.691,0.335,2.085,2.405,2.167,3.199v0.027c0.024,0.271-0.082,0.491-0.273,0.623c-0.132,0.083-4.43,1.155-4.43,1.155\tc-0.322,0.096-0.68-0.06-0.882-0.381L11.464,10.789z M9.475,9.563C9.32,9.609,8.848,9.757,8.269,8.817c0,0-3.916-6.16-4.007-6.351\tc-0.057-0.212,0.011-0.455,0.202-0.65C5.047,1.211,8.21,0.327,9.037,0.529c0.27,0.069,0.457,0.238,0.522,0.479\tc0.047,0.266,0.433,5.982,0.488,7.264C10.098,9.368,9.629,9.517,9.475,9.563z M9.927,19.066c-0.083,0.225-0.273,0.373-0.54,0.421\tc-0.762,0.13-3.15-0.751-3.647-1.342c-0.096-0.131-0.155-0.262-0.167-0.394c-0.011-0.095,0-0.189,0.036-0.272\tc0.061-0.155,2.917-3.538,2.917-3.538c0.214-0.272,0.595-0.355,0.952-0.213c0.345,0.13,0.56,0.428,0.536,0.749\tC10.014,14.479,9.977,18.923,9.927,19.066z M3.495,13.912c-0.235-0.009-0.444-0.148-0.568-0.382c-0.089-0.17-0.151-0.453-0.19-0.794\tC2.63,11.701,2.761,10.144,3.07,9.648c0.145-0.226,0.357-0.345,0.592-0.336c0.154,0,4.255,1.667,4.255,1.667\tc0.321,0.118,0.521,0.453,0.5,0.833c-0.023,0.37-0.236,0.655-0.551,0.738L3.495,13.912z\"></path></svg>";
-var youtube = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M15,4.1c1,0.1,2.3,0,3,0.8c0.8,0.8,0.9,2.1,0.9,3.1C19,9.2,19,10.9,19,12c-0.1,1.1,0,2.4-0.5,3.4c-0.5,1.1-1.4,1.5-2.5,1.6 c-1.2,0.1-8.6,0.1-11,0c-1.1-0.1-2.4-0.1-3.2-1c-0.7-0.8-0.7-2-0.8-3C1,11.8,1,10.1,1,8.9c0-1.1,0-2.4,0.5-3.4C2,4.5,3,4.3,4.1,4.2 C5.3,4.1,12.6,4,15,4.1z M8,7.5v6l5.5-3L8,7.5z\"></path></svg>";
-var Icons = {
-	album: album,
-	ban: ban,
-	behance: behance,
-	bell: bell,
-	bold: bold,
-	bolt: bolt,
-	bookmark: bookmark,
-	calendar: calendar,
-	camera: camera,
-	cart: cart,
-	check: check,
-	clock: clock,
-	close: close,
-	code: code,
-	cog: cog,
-	comment: comment,
-	commenting: commenting,
-	comments: comments,
-	copy: copy,
-	database: database,
-	desktop: desktop,
-	download: download,
-	dribbble: dribbble,
-	expand: expand,
-	facebook: facebook,
-	file: file,
-	flickr: flickr,
-	folder: folder,
-	forward: forward,
-	foursquare: foursquare,
-	future: future,
-	github: github,
-	gitter: gitter,
-	google: google,
-	grid: grid,
-	happy: happy,
-	hashtag: hashtag,
-	heart: heart,
-	history: history,
-	home: home,
-	image: image,
-	info: info,
-	instagram: instagram,
-	italic: italic,
-	joomla: joomla,
-	laptop: laptop,
-	lifesaver: lifesaver,
-	link: link,
-	linkedin: linkedin,
-	list: list,
-	location: location,
-	lock: lock,
-	mail: mail,
-	menu: menu,
-	minus: minus,
-	more: more,
-	move: move,
-	nut: nut,
-	pagekit: pagekit,
-	pencil: pencil,
-	phone: phone,
-	pinterest: pinterest,
-	play: play,
-	plus: plus,
-	pull: pull,
-	push: push,
-	question: question,
-	receiver: receiver,
-	refresh: refresh,
-	reply: reply,
-	rss: rss,
-	search: search,
-	server: server,
-	settings: settings,
-	shrink: shrink,
-	social: social,
-	soundcloud: soundcloud,
-	star: star,
-	strikethrough: strikethrough,
-	table: table,
-	tablet: tablet,
-	tag: tag,
-	thumbnails: thumbnails,
-	trash: trash,
-	tripadvisor: tripadvisor,
-	tumblr: tumblr,
-	tv: tv,
-	twitter: twitter,
-	uikit: uikit,
-	unlock: unlock,
-	upload: upload,
-	user: user,
-	users: users,
-	vimeo: vimeo,
-	warning: warning,
-	whatsapp: whatsapp,
-	wordpress: wordpress,
-	world: world,
-	xing: xing,
-	yelp: yelp,
-	youtube: youtube,
-	"500px": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M9.624,11.866c-0.141,0.132,0.479,0.658,0.662,0.418c0.051-0.046,0.607-0.61,0.662-0.664c0,0,0.738,0.719,0.814,0.719\t\tc0.1,0,0.207-0.055,0.322-0.17c0.27-0.269,0.135-0.416,0.066-0.495l-0.631-0.616l0.658-0.668c0.146-0.156,0.021-0.314-0.1-0.449\t\tc-0.182-0.18-0.359-0.226-0.471-0.125l-0.656,0.654l-0.654-0.654c-0.033-0.034-0.08-0.045-0.124-0.045\t\tc-0.079,0-0.191,0.068-0.307,0.181c-0.202,0.202-0.247,0.351-0.133,0.462l0.665,0.665L9.624,11.866z\"></path> <path d=\"M11.066,2.884c-1.061,0-2.185,0.248-3.011,0.604c-0.087,0.034-0.141,0.106-0.15,0.205C7.893,3.784,7.919,3.909,7.982,4.066\t\tc0.05,0.136,0.187,0.474,0.452,0.372c0.844-0.326,1.779-0.507,2.633-0.507c0.963,0,1.9,0.191,2.781,0.564\t\tc0.695,0.292,1.357,0.719,2.078,1.34c0.051,0.044,0.105,0.068,0.164,0.068c0.143,0,0.273-0.137,0.389-0.271\t\tc0.191-0.214,0.324-0.395,0.135-0.575c-0.686-0.654-1.436-1.138-2.363-1.533C13.24,3.097,12.168,2.884,11.066,2.884z\"></path> <path d=\"M16.43,15.747c-0.092-0.028-0.242,0.05-0.309,0.119l0,0c-0.652,0.652-1.42,1.169-2.268,1.521\t\tc-0.877,0.371-1.814,0.551-2.779,0.551c-0.961,0-1.896-0.189-2.775-0.564c-0.848-0.36-1.612-0.879-2.268-1.53\t\tc-0.682-0.688-1.196-1.455-1.529-2.268c-0.325-0.799-0.471-1.643-0.471-1.643c-0.045-0.24-0.258-0.249-0.567-0.203\t\tc-0.128,0.021-0.519,0.079-0.483,0.36v0.01c0.105,0.644,0.289,1.284,0.545,1.895c0.417,0.969,1.002,1.849,1.756,2.604\t\tc0.757,0.754,1.636,1.34,2.604,1.757C8.901,18.785,9.97,19,11.088,19c1.104,0,2.186-0.215,3.188-0.645\t\tc1.838-0.896,2.604-1.757,2.604-1.757c0.182-0.204,0.227-0.317-0.1-0.643C16.779,15.956,16.525,15.774,16.43,15.747z\"></path> <path d=\"M5.633,13.287c0.293,0.71,0.723,1.341,1.262,1.882c0.54,0.54,1.172,0.971,1.882,1.264c0.731,0.303,1.509,0.461,2.298,0.461\t\tc0.801,0,1.578-0.158,2.297-0.461c0.711-0.293,1.344-0.724,1.883-1.264c0.543-0.541,0.971-1.172,1.264-1.882\t\tc0.314-0.721,0.463-1.5,0.463-2.298c0-0.79-0.148-1.569-0.463-2.289c-0.293-0.699-0.721-1.329-1.264-1.881\t\tc-0.539-0.541-1.172-0.959-1.867-1.263c-0.721-0.303-1.5-0.461-2.299-0.461c-0.802,0-1.613,0.159-2.322,0.461\t\tc-0.577,0.25-1.544,0.867-2.119,1.454v0.012V2.108h8.16C15.1,2.104,15.1,1.69,15.1,1.552C15.1,1.417,15.1,1,14.809,1H5.915\t\tC5.676,1,5.527,1.192,5.527,1.384v6.84c0,0.214,0.273,0.372,0.529,0.428c0.5,0.105,0.614-0.056,0.737-0.224l0,0\t\tc0.18-0.273,0.776-0.884,0.787-0.894c0.901-0.905,2.117-1.408,3.416-1.408c1.285,0,2.5,0.501,3.412,1.408\t\tc0.914,0.914,1.408,2.122,1.408,3.405c0,1.288-0.508,2.496-1.408,3.405c-0.9,0.896-2.152,1.406-3.438,1.406\t\tc-0.877,0-1.711-0.229-2.433-0.671v-4.158c0-0.553,0.237-1.151,0.643-1.614c0.462-0.519,1.094-0.799,1.782-0.799\t\tc0.664,0,1.293,0.253,1.758,0.715c0.459,0.459,0.709,1.071,0.709,1.723c0,1.385-1.094,2.468-2.488,2.468\t\tc-0.273,0-0.769-0.121-0.781-0.125c-0.281-0.087-0.405,0.306-0.438,0.436c-0.159,0.496,0.079,0.585,0.123,0.607\t\tc0.452,0.137,0.743,0.157,1.129,0.157c1.973,0,3.572-1.6,3.572-3.57c0-1.964-1.6-3.552-3.572-3.552c-0.97,0-1.872,0.36-2.546,1.038\t\tc-0.656,0.631-1.027,1.487-1.027,2.322v3.438v-0.011c-0.372-0.42-0.732-1.041-0.981-1.682c-0.102-0.248-0.315-0.202-0.607-0.113\t\tc-0.135,0.035-0.519,0.157-0.44,0.439C5.372,12.799,5.577,13.164,5.633,13.287z\"></path></svg>",
-	"arrow-down": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"10.5,16.08 5.63,10.66 6.37,10 10.5,14.58 14.63,10 15.37,10.66\"></polygon> <line fill=\"none\" stroke=\"#000\" x1=\"10.5\" y1=\"4\" x2=\"10.5\" y2=\"15\"></line></svg>",
-	"arrow-left": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" points=\"10 14 5 9.5 10 5\"></polyline> <line fill=\"none\" stroke=\"#000\" x1=\"16\" y1=\"9.5\" x2=\"5\" y2=\"9.52\"></line></svg>",
-	"arrow-right": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" points=\"10 5 15 9.5 10 14\"></polyline> <line fill=\"none\" stroke=\"#000\" x1=\"4\" y1=\"9.5\" x2=\"15\" y2=\"9.5\"></line></svg>",
-	"arrow-up": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"10.5,4 15.37,9.4 14.63,10.08 10.5,5.49 6.37,10.08 5.63,9.4\"></polygon> <line fill=\"none\" stroke=\"#000\" x1=\"10.5\" y1=\"16\" x2=\"10.5\" y2=\"5\"></line></svg>",
-	"chevron-down": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" stroke-width=\"1.03\" points=\"16 7 10 13 4 7\"></polyline></svg>",
-	"chevron-left": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" stroke-width=\"1.03\" points=\"13 16 7 10 13 4\"></polyline></svg>",
-	"chevron-right": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" stroke-width=\"1.03\" points=\"7 4 13 10 7 16\"></polyline></svg>",
-	"chevron-up": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" stroke-width=\"1.03\" points=\"4 13 10 7 16 13\"></polyline></svg>",
-	"cloud-download": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M6.5,14.61 L3.75,14.61 C1.96,14.61 0.5,13.17 0.5,11.39 C0.5,9.76 1.72,8.41 3.3,8.2 C3.38,5.31 5.75,3 8.68,3 C11.19,3 13.31,4.71 13.89,7.02 C14.39,6.8 14.93,6.68 15.5,6.68 C17.71,6.68 19.5,8.45 19.5,10.64 C19.5,12.83 17.71,14.6 15.5,14.6 L12.5,14.6\"></path> <polyline fill=\"none\" stroke=\"#000\" points=\"11.75 16 9.5 18.25 7.25 16\"></polyline> <path fill=\"none\" stroke=\"#000\" d=\"M9.5,18 L9.5,9.5\"></path></svg>",
-	"cloud-upload": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M6.5,14.61 L3.75,14.61 C1.96,14.61 0.5,13.17 0.5,11.39 C0.5,9.76 1.72,8.41 3.31,8.2 C3.38,5.31 5.75,3 8.68,3 C11.19,3 13.31,4.71 13.89,7.02 C14.39,6.8 14.93,6.68 15.5,6.68 C17.71,6.68 19.5,8.45 19.5,10.64 C19.5,12.83 17.71,14.6 15.5,14.6 L12.5,14.6\"></path> <polyline fill=\"none\" stroke=\"#000\" points=\"7.25 11.75 9.5 9.5 11.75 11.75\"></polyline> <path fill=\"none\" stroke=\"#000\" d=\"M9.5,18 L9.5,9.5\"></path></svg>",
-	"credit-card": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect fill=\"none\" stroke=\"#000\" x=\"1.5\" y=\"4.5\" width=\"17\" height=\"12\"></rect> <rect x=\"1\" y=\"7\" width=\"18\" height=\"3\"></rect></svg>",
-	"file-edit": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" d=\"M18.65,1.68 C18.41,1.45 18.109,1.33 17.81,1.33 C17.499,1.33 17.209,1.45 16.98,1.68 L8.92,9.76 L8,12.33 L10.55,11.41 L18.651,3.34 C19.12,2.87 19.12,2.15 18.65,1.68 L18.65,1.68 L18.65,1.68 Z\"></path> <polyline fill=\"none\" stroke=\"#000\" points=\"16.5 8.482 16.5 18.5 3.5 18.5 3.5 1.5 14.211 1.5\"></polyline></svg>",
-	"git-branch": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"7\" cy=\"3\" r=\"2\"></circle> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"14\" cy=\"6\" r=\"2\"></circle> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"7\" cy=\"17\" r=\"2\"></circle> <path fill=\"none\" stroke=\"#000\" stroke-width=\"2\" d=\"M14,8 C14,10.41 12.43,10.87 10.56,11.25 C9.09,11.54 7,12.06 7,15 L7,5\"></path></svg>",
-	"git-fork": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"5.79\" cy=\"2.79\" r=\"1.79\"></circle> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"14.19\" cy=\"2.79\" r=\"1.79\"></circle> <ellipse fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"10.03\" cy=\"16.79\" rx=\"1.79\" ry=\"1.79\"></ellipse> <path fill=\"none\" stroke=\"#000\" stroke-width=\"2\" d=\"M5.79,4.57 L5.79,6.56 C5.79,9.19 10.03,10.22 10.03,13.31 C10.03,14.86 10.04,14.55 10.04,14.55 C10.04,14.37 10.04,14.86 10.04,13.31 C10.04,10.22 14.2,9.19 14.2,6.56 L14.2,4.57\"></path></svg>",
-	"github-alt": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M10,0.5 C4.75,0.5 0.5,4.76 0.5,10.01 C0.5,15.26 4.75,19.51 10,19.51 C15.24,19.51 19.5,15.26 19.5,10.01 C19.5,4.76 15.25,0.5 10,0.5 L10,0.5 Z M12.81,17.69 C12.81,17.69 12.81,17.7 12.79,17.69 C12.47,17.75 12.35,17.59 12.35,17.36 L12.35,16.17 C12.35,15.45 12.09,14.92 11.58,14.56 C12.2,14.51 12.77,14.39 13.26,14.21 C13.87,13.98 14.36,13.69 14.74,13.29 C15.42,12.59 15.76,11.55 15.76,10.17 C15.76,9.25 15.45,8.46 14.83,7.8 C15.1,7.08 15.07,6.29 14.75,5.44 L14.51,5.42 C14.34,5.4 14.06,5.46 13.67,5.61 C13.25,5.78 12.79,6.03 12.31,6.35 C11.55,6.16 10.81,6.05 10.09,6.05 C9.36,6.05 8.61,6.15 7.88,6.35 C7.28,5.96 6.75,5.68 6.26,5.54 C6.07,5.47 5.9,5.44 5.78,5.44 L5.42,5.44 C5.06,6.29 5.04,7.08 5.32,7.8 C4.7,8.46 4.4,9.25 4.4,10.17 C4.4,11.94 4.96,13.16 6.08,13.84 C6.53,14.13 7.05,14.32 7.69,14.43 C8.03,14.5 8.32,14.54 8.55,14.55 C8.07,14.89 7.82,15.42 7.82,16.16 L7.82,17.51 C7.8,17.69 7.7,17.8 7.51,17.8 C4.21,16.74 1.82,13.65 1.82,10.01 C1.82,5.5 5.49,1.83 10,1.83 C14.5,1.83 18.17,5.5 18.17,10.01 C18.18,13.53 15.94,16.54 12.81,17.69 L12.81,17.69 Z\"></path></svg>",
-	"google-plus": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M12.9,9c0,2.7-0.6,5-3.2,6.3c-3.7,1.8-8.1,0.2-9.4-3.6C-1.1,7.6,1.9,3.3,6.1,3c1.7-0.1,3.2,0.3,4.6,1.3 c0.1,0.1,0.3,0.2,0.4,0.4c-0.5,0.5-1.2,1-1.7,1.6c-1-0.8-2.1-1.1-3.5-0.9C5,5.6,4.2,6,3.6,6.7c-1.3,1.3-1.5,3.4-0.5,5 c1,1.7,2.6,2.3,4.6,1.9c1.4-0.3,2.4-1.2,2.6-2.6H6.9V9H12.9z\"></path> <polygon points=\"20,9 20,11 18,11 18,13 16,13 16,11 14,11 14,9 16,9 16,7 18,7 18,9 \"></polygon></svg>",
-	"minus-circle": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"9.5\" cy=\"9.5\" r=\"9\"></circle> <line fill=\"none\" stroke=\"#000\" x1=\"5\" y1=\"9.5\" x2=\"14\" y2=\"9.5\"></line></svg>",
-	"more-vertical": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle cx=\"10\" cy=\"3\" r=\"2\"></circle> <circle cx=\"10\" cy=\"10\" r=\"2\"></circle> <circle cx=\"10\" cy=\"17\" r=\"2\"></circle></svg>",
-	"paint-bucket": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M10.21,1 L0,11.21 L8.1,19.31 L18.31,9.1 L10.21,1 L10.21,1 Z M16.89,9.1 L15,11 L1.7,11 L10.21,2.42 L16.89,9.1 Z\"></path> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M6.42,2.33 L11.7,7.61\"></path> <path d=\"M18.49,12 C18.49,12 20,14.06 20,15.36 C20,16.28 19.24,17 18.49,17 L18.49,17 C17.74,17 17,16.28 17,15.36 C17,14.06 18.49,12 18.49,12 L18.49,12 Z\"></path></svg>",
-	"phone-landscape": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" d=\"M17,5.5 C17.8,5.5 18.5,6.2 18.5,7 L18.5,14 C18.5,14.8 17.8,15.5 17,15.5 L3,15.5 C2.2,15.5 1.5,14.8 1.5,14 L1.5,7 C1.5,6.2 2.2,5.5 3,5.5 L17,5.5 L17,5.5 L17,5.5 Z\"></path> <circle cx=\"3.8\" cy=\"10.5\" r=\"0.8\"></circle></svg>",
-	"play-circle": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" points=\"8.5 7 13.5 10 8.5 13\"></polygon> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"10\" cy=\"10\" r=\"9\"></circle></svg>",
-	"plus-circle": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"9.5\" cy=\"9.5\" r=\"9\"></circle> <line fill=\"none\" stroke=\"#000\" x1=\"9.5\" y1=\"5\" x2=\"9.5\" y2=\"14\"></line> <line fill=\"none\" stroke=\"#000\" x1=\"5\" y1=\"9.5\" x2=\"14\" y2=\"9.5\"></line></svg>",
-	"quote-right": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M17.27,7.79 C17.27,9.45 16.97,10.43 15.99,12.02 C14.98,13.64 13,15.23 11.56,15.97 L11.1,15.08 C12.34,14.2 13.14,13.51 14.02,11.82 C14.27,11.34 14.41,10.92 14.49,10.54 C14.3,10.58 14.09,10.6 13.88,10.6 C12.06,10.6 10.59,9.12 10.59,7.3 C10.59,5.48 12.06,4 13.88,4 C15.39,4 16.67,5.02 17.05,6.42 C17.19,6.82 17.27,7.27 17.27,7.79 L17.27,7.79 Z\"></path> <path d=\"M8.68,7.79 C8.68,9.45 8.38,10.43 7.4,12.02 C6.39,13.64 4.41,15.23 2.97,15.97 L2.51,15.08 C3.75,14.2 4.55,13.51 5.43,11.82 C5.68,11.34 5.82,10.92 5.9,10.54 C5.71,10.58 5.5,10.6 5.29,10.6 C3.47,10.6 2,9.12 2,7.3 C2,5.48 3.47,4 5.29,4 C6.8,4 8.08,5.02 8.46,6.42 C8.6,6.82 8.68,7.27 8.68,7.79 L8.68,7.79 Z\"></path></svg>",
-	"sign-in": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"7 2 17 2 17 17 7 17 7 16 16 16 16 3 7 3\"></polygon> <polygon points=\"9.1 13.4 8.5 12.8 11.28 10 4 10 4 9 11.28 9 8.5 6.2 9.1 5.62 13 9.5\"></polygon></svg>",
-	"sign-out": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"13.1 13.4 12.5 12.8 15.28 10 8 10 8 9 15.28 9 12.5 6.2 13.1 5.62 17 9.5\"></polygon> <polygon points=\"13 2 3 2 3 17 13 17 13 16 4 16 4 3 13 3\"></polygon></svg>",
-	"tablet-landscape": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" d=\"M1.5,5 C1.5,4.2 2.2,3.5 3,3.5 L17,3.5 C17.8,3.5 18.5,4.2 18.5,5 L18.5,16 C18.5,16.8 17.8,17.5 17,17.5 L3,17.5 C2.2,17.5 1.5,16.8 1.5,16 L1.5,5 L1.5,5 L1.5,5 Z\"></path> <circle cx=\"3.7\" cy=\"10.5\" r=\"0.8\"></circle></svg>",
-	"triangle-down": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"5 7 15 7 10 12\"></polygon></svg>",
-	"triangle-left": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"12 5 7 10 12 15\"></polygon></svg>",
-	"triangle-right": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"8 5 13 10 8 15\"></polygon></svg>",
-	"triangle-up": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"5 13 10 8 15 13\"></polygon></svg>",
-	"video-camera": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"18,6 18,14 12,10 \"></polygon> <rect x=\"2\" y=\"5\" width=\"12\" height=\"10\"></rect></svg>"
-};
 
-function plugin(UIkit) {
+        if (plugin.installed) {
+            return;
+        }
+
+        UIkit.icon.add({
+        "500px": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M9.624,11.866c-0.141,0.132,0.479,0.658,0.662,0.418c0.051-0.046,0.607-0.61,0.662-0.664c0,0,0.738,0.719,0.814,0.719\t\tc0.1,0,0.207-0.055,0.322-0.17c0.27-0.269,0.135-0.416,0.066-0.495l-0.631-0.616l0.658-0.668c0.146-0.156,0.021-0.314-0.1-0.449\t\tc-0.182-0.18-0.359-0.226-0.471-0.125l-0.656,0.654l-0.654-0.654c-0.033-0.034-0.08-0.045-0.124-0.045\t\tc-0.079,0-0.191,0.068-0.307,0.181c-0.202,0.202-0.247,0.351-0.133,0.462l0.665,0.665L9.624,11.866z\" /> <path d=\"M11.066,2.884c-1.061,0-2.185,0.248-3.011,0.604c-0.087,0.034-0.141,0.106-0.15,0.205C7.893,3.784,7.919,3.909,7.982,4.066\t\tc0.05,0.136,0.187,0.474,0.452,0.372c0.844-0.326,1.779-0.507,2.633-0.507c0.963,0,1.9,0.191,2.781,0.564\t\tc0.695,0.292,1.357,0.719,2.078,1.34c0.051,0.044,0.105,0.068,0.164,0.068c0.143,0,0.273-0.137,0.389-0.271\t\tc0.191-0.214,0.324-0.395,0.135-0.575c-0.686-0.654-1.436-1.138-2.363-1.533C13.24,3.097,12.168,2.884,11.066,2.884z\" /> <path d=\"M16.43,15.747c-0.092-0.028-0.242,0.05-0.309,0.119l0,0c-0.652,0.652-1.42,1.169-2.268,1.521\t\tc-0.877,0.371-1.814,0.551-2.779,0.551c-0.961,0-1.896-0.189-2.775-0.564c-0.848-0.36-1.612-0.879-2.268-1.53\t\tc-0.682-0.688-1.196-1.455-1.529-2.268c-0.325-0.799-0.471-1.643-0.471-1.643c-0.045-0.24-0.258-0.249-0.567-0.203\t\tc-0.128,0.021-0.519,0.079-0.483,0.36v0.01c0.105,0.644,0.289,1.284,0.545,1.895c0.417,0.969,1.002,1.849,1.756,2.604\t\tc0.757,0.754,1.636,1.34,2.604,1.757C8.901,18.785,9.97,19,11.088,19c1.104,0,2.186-0.215,3.188-0.645\t\tc1.838-0.896,2.604-1.757,2.604-1.757c0.182-0.204,0.227-0.317-0.1-0.643C16.779,15.956,16.525,15.774,16.43,15.747z\" /> <path d=\"M5.633,13.287c0.293,0.71,0.723,1.341,1.262,1.882c0.54,0.54,1.172,0.971,1.882,1.264c0.731,0.303,1.509,0.461,2.298,0.461\t\tc0.801,0,1.578-0.158,2.297-0.461c0.711-0.293,1.344-0.724,1.883-1.264c0.543-0.541,0.971-1.172,1.264-1.882\t\tc0.314-0.721,0.463-1.5,0.463-2.298c0-0.79-0.148-1.569-0.463-2.289c-0.293-0.699-0.721-1.329-1.264-1.881\t\tc-0.539-0.541-1.172-0.959-1.867-1.263c-0.721-0.303-1.5-0.461-2.299-0.461c-0.802,0-1.613,0.159-2.322,0.461\t\tc-0.577,0.25-1.544,0.867-2.119,1.454v0.012V2.108h8.16C15.1,2.104,15.1,1.69,15.1,1.552C15.1,1.417,15.1,1,14.809,1H5.915\t\tC5.676,1,5.527,1.192,5.527,1.384v6.84c0,0.214,0.273,0.372,0.529,0.428c0.5,0.105,0.614-0.056,0.737-0.224l0,0\t\tc0.18-0.273,0.776-0.884,0.787-0.894c0.901-0.905,2.117-1.408,3.416-1.408c1.285,0,2.5,0.501,3.412,1.408\t\tc0.914,0.914,1.408,2.122,1.408,3.405c0,1.288-0.508,2.496-1.408,3.405c-0.9,0.896-2.152,1.406-3.438,1.406\t\tc-0.877,0-1.711-0.229-2.433-0.671v-4.158c0-0.553,0.237-1.151,0.643-1.614c0.462-0.519,1.094-0.799,1.782-0.799\t\tc0.664,0,1.293,0.253,1.758,0.715c0.459,0.459,0.709,1.071,0.709,1.723c0,1.385-1.094,2.468-2.488,2.468\t\tc-0.273,0-0.769-0.121-0.781-0.125c-0.281-0.087-0.405,0.306-0.438,0.436c-0.159,0.496,0.079,0.585,0.123,0.607\t\tc0.452,0.137,0.743,0.157,1.129,0.157c1.973,0,3.572-1.6,3.572-3.57c0-1.964-1.6-3.552-3.572-3.552c-0.97,0-1.872,0.36-2.546,1.038\t\tc-0.656,0.631-1.027,1.487-1.027,2.322v3.438v-0.011c-0.372-0.42-0.732-1.041-0.981-1.682c-0.102-0.248-0.315-0.202-0.607-0.113\t\tc-0.135,0.035-0.519,0.157-0.44,0.439C5.372,12.799,5.577,13.164,5.633,13.287z\" /></svg>",
+        "album": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"5\" y=\"2\" width=\"10\" height=\"1\" /> <rect x=\"3\" y=\"4\" width=\"14\" height=\"1\" /> <rect fill=\"none\" stroke=\"#000\" x=\"1.5\" y=\"6.5\" width=\"17\" height=\"11\" /></svg>",
+        "arrow-down": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"10.5,16.08 5.63,10.66 6.37,10 10.5,14.58 14.63,10 15.37,10.66\" /> <line fill=\"none\" stroke=\"#000\" x1=\"10.5\" y1=\"4\" x2=\"10.5\" y2=\"15\" /></svg>",
+        "arrow-left": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" points=\"10 14 5 9.5 10 5\" /> <line fill=\"none\" stroke=\"#000\" x1=\"16\" y1=\"9.5\" x2=\"5\" y2=\"9.52\" /></svg>",
+        "arrow-right": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" points=\"10 5 15 9.5 10 14\" /> <line fill=\"none\" stroke=\"#000\" x1=\"4\" y1=\"9.5\" x2=\"15\" y2=\"9.5\" /></svg>",
+        "arrow-up": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"10.5,4 15.37,9.4 14.63,10.08 10.5,5.49 6.37,10.08 5.63,9.4\" /> <line fill=\"none\" stroke=\"#000\" x1=\"10.5\" y1=\"16\" x2=\"10.5\" y2=\"5\" /></svg>",
+        "ban": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"10\" cy=\"10\" r=\"9\" /> <line fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" x1=\"4\" y1=\"3.5\" x2=\"16\" y2=\"16.5\" /></svg>",
+        "behance": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M9.5,10.6c-0.4-0.5-0.9-0.9-1.6-1.1c1.7-1,2.2-3.2,0.7-4.7C7.8,4,6.3,4,5.2,4C3.5,4,1.7,4,0,4v12c1.7,0,3.4,0,5.2,0 c1,0,2.1,0,3.1-0.5C10.2,14.6,10.5,12.3,9.5,10.6L9.5,10.6z M5.6,6.1c1.8,0,1.8,2.7-0.1,2.7c-1,0-2,0-2.9,0V6.1H5.6z M2.6,13.8v-3.1 c1.1,0,2.1,0,3.2,0c2.1,0,2.1,3.2,0.1,3.2L2.6,13.8z\" /> <path d=\"M19.9,10.9C19.7,9.2,18.7,7.6,17,7c-4.2-1.3-7.3,3.4-5.3,7.1c0.9,1.7,2.8,2.3,4.7,2.1c1.7-0.2,2.9-1.3,3.4-2.9h-2.2 c-0.4,1.3-2.4,1.5-3.5,0.6c-0.4-0.4-0.6-1.1-0.6-1.7H20C20,11.7,19.9,10.9,19.9,10.9z M13.5,10.6c0-1.6,2.3-2.7,3.5-1.4 c0.4,0.4,0.5,0.9,0.6,1.4H13.5L13.5,10.6z\" /> <rect x=\"13\" y=\"4\" width=\"5\" height=\"1.4\" /></svg>",
+        "bell": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M17,15.5 L3,15.5 C2.99,14.61 3.79,13.34 4.1,12.51 C4.58,11.3 4.72,10.35 5.19,7.01 C5.54,4.53 5.89,3.2 7.28,2.16 C8.13,1.56 9.37,1.5 9.81,1.5 L9.96,1.5 C9.96,1.5 11.62,1.41 12.67,2.17 C14.08,3.2 14.42,4.54 14.77,7.02 C15.26,10.35 15.4,11.31 15.87,12.52 C16.2,13.34 17.01,14.61 17,15.5 L17,15.5 Z\" /> <path fill=\"none\" stroke=\"#000\" d=\"M12.39,16 C12.39,17.37 11.35,18.43 9.91,18.43 C8.48,18.43 7.42,17.37 7.42,16\" /></svg>",
+        "bold": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M5,15.3 C5.66,15.3 5.9,15 5.9,14.53 L5.9,5.5 C5.9,4.92 5.56,4.7 5,4.7 L5,4 L8.95,4 C12.6,4 13.7,5.37 13.7,6.9 C13.7,7.87 13.14,9.17 10.86,9.59 L10.86,9.7 C13.25,9.86 14.29,11.28 14.3,12.54 C14.3,14.47 12.94,16 9,16 L5,16 L5,15.3 Z M9,9.3 C11.19,9.3 11.8,8.5 11.85,7 C11.85,5.65 11.3,4.8 9,4.8 L7.67,4.8 L7.67,9.3 L9,9.3 Z M9.185,15.22 C11.97,15 12.39,14 12.4,12.58 C12.4,11.15 11.39,10 9,10 L7.67,10 L7.67,15 L9.18,15 Z\" /></svg>",
+        "bolt": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M4.74,20 L7.73,12 L3,12 L15.43,1 L12.32,9 L17.02,9 L4.74,20 L4.74,20 L4.74,20 Z M9.18,11 L7.1,16.39 L14.47,10 L10.86,10 L12.99,4.67 L5.61,11 L9.18,11 L9.18,11 L9.18,11 Z\" /></svg>",
+        "bookmark": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon fill=\"none\" stroke=\"#000\" points=\"5.5 1.5 15.5 1.5 15.5 17.5 10.5 12.5 5.5 17.5\" /></svg>",
+        "calendar": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M 2,3 2,17 18,17 18,3 2,3 Z M 17,16 3,16 3,8 17,8 17,16 Z M 17,7 3,7 3,4 17,4 17,7 Z\" /> <rect width=\"1\" height=\"3\" x=\"6\" y=\"2\" /> <rect width=\"1\" height=\"3\" x=\"13\" y=\"2\" /></svg>",
+        "camera": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"10\" cy=\"10.8\" r=\"3.8\" /> <path fill=\"none\" stroke=\"#000\" d=\"M1,4.5 C0.7,4.5 0.5,4.7 0.5,5 L0.5,17 C0.5,17.3 0.7,17.5 1,17.5 L19,17.5 C19.3,17.5 19.5,17.3 19.5,17 L19.5,5 C19.5,4.7 19.3,4.5 19,4.5 L13.5,4.5 L13.5,2.9 C13.5,2.6 13.3,2.5 13,2.5 L7,2.5 C6.7,2.5 6.5,2.6 6.5,2.9 L6.5,4.5 L1,4.5 L1,4.5 Z\" /></svg>",
+        "cart": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle cx=\"7.3\" cy=\"17.3\" r=\"1.4\" /> <circle cx=\"13.3\" cy=\"17.3\" r=\"1.4\" /> <polyline fill=\"none\" stroke=\"#000\" points=\"0 2 3.2 4 5.3 12.5 16 12.5 18 6.5 8 6.5\" /></svg>",
+        "check": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" points=\"4,10 8,15 17,4\" /></svg>",
+        "chevron-down": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" stroke-width=\"1.03\" points=\"16 7 10 13 4 7\" /></svg>",
+        "chevron-left": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" stroke-width=\"1.03\" points=\"13 16 7 10 13 4\" /></svg>",
+        "chevron-right": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" stroke-width=\"1.03\" points=\"7 4 13 10 7 16\" /></svg>",
+        "chevron-up": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" stroke-width=\"1.03\" points=\"4 13 10 7 16 13\" /></svg>",
+        "clock": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"10\" cy=\"10\" r=\"9\" /> <rect x=\"9\" y=\"4\" width=\"1\" height=\"7\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M13.018,14.197 L9.445,10.625\" /></svg>",
+        "close": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.06\" d=\"M16,16 L4,4\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.06\" d=\"M16,4 L4,16\" /></svg>",
+        "cloud-download": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M6.5,14.61 L3.75,14.61 C1.96,14.61 0.5,13.17 0.5,11.39 C0.5,9.76 1.72,8.41 3.3,8.2 C3.38,5.31 5.75,3 8.68,3 C11.19,3 13.31,4.71 13.89,7.02 C14.39,6.8 14.93,6.68 15.5,6.68 C17.71,6.68 19.5,8.45 19.5,10.64 C19.5,12.83 17.71,14.6 15.5,14.6 L12.5,14.6\" /> <polyline fill=\"none\" stroke=\"#000\" points=\"11.75 16 9.5 18.25 7.25 16\" /> <path fill=\"none\" stroke=\"#000\" d=\"M9.5,18 L9.5,9.5\" /></svg>",
+        "cloud-upload": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M6.5,14.61 L3.75,14.61 C1.96,14.61 0.5,13.17 0.5,11.39 C0.5,9.76 1.72,8.41 3.31,8.2 C3.38,5.31 5.75,3 8.68,3 C11.19,3 13.31,4.71 13.89,7.02 C14.39,6.8 14.93,6.68 15.5,6.68 C17.71,6.68 19.5,8.45 19.5,10.64 C19.5,12.83 17.71,14.6 15.5,14.6 L12.5,14.6\" /> <polyline fill=\"none\" stroke=\"#000\" points=\"7.25 11.75 9.5 9.5 11.75 11.75\" /> <path fill=\"none\" stroke=\"#000\" d=\"M9.5,18 L9.5,9.5\" /></svg>",
+        "code": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" stroke-width=\"1.01\" points=\"13,4 19,10 13,16\" /> <polyline fill=\"none\" stroke=\"#000\" stroke-width=\"1.01\" points=\"7,4 1,10 7,16\" /></svg>",
+        "cog": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" cx=\"9.997\" cy=\"10\" r=\"3.31\" /> <path fill=\"none\" stroke=\"#000\" d=\"M18.488,12.285 L16.205,16.237 C15.322,15.496 14.185,15.281 13.303,15.791 C12.428,16.289 12.047,17.373 12.246,18.5 L7.735,18.5 C7.938,17.374 7.553,16.299 6.684,15.791 C5.801,15.27 4.655,15.492 3.773,16.237 L1.5,12.285 C2.573,11.871 3.317,10.999 3.317,9.991 C3.305,8.98 2.573,8.121 1.5,7.716 L3.765,3.784 C4.645,4.516 5.794,4.738 6.687,4.232 C7.555,3.722 7.939,2.637 7.735,1.5 L12.263,1.5 C12.072,2.637 12.441,3.71 13.314,4.22 C14.206,4.73 15.343,4.516 16.225,3.794 L18.487,7.714 C17.404,8.117 16.661,8.988 16.67,10.009 C16.672,11.018 17.415,11.88 18.488,12.285 L18.488,12.285 Z\" /></svg>",
+        "comment": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M6,18.71 L6,14 L1,14 L1,1 L19,1 L19,14 L10.71,14 L6,18.71 L6,18.71 Z M2,13 L7,13 L7,16.29 L10.29,13 L18,13 L18,2 L2,2 L2,13 L2,13 Z\" /></svg>",
+        "commenting": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon fill=\"none\" stroke=\"#000\" points=\"1.5,1.5 18.5,1.5 18.5,13.5 10.5,13.5 6.5,17.5 6.5,13.5 1.5,13.5\" /> <circle cx=\"10\" cy=\"8\" r=\"1\" /> <circle cx=\"6\" cy=\"8\" r=\"1\" /> <circle cx=\"14\" cy=\"8\" r=\"1\" /></svg>",
+        "comments": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" points=\"2 0.5 19.5 0.5 19.5 13\" /> <path d=\"M5,19.71 L5,15 L0,15 L0,2 L18,2 L18,15 L9.71,15 L5,19.71 L5,19.71 L5,19.71 Z M1,14 L6,14 L6,17.29 L9.29,14 L17,14 L17,3 L1,3 L1,14 L1,14 L1,14 Z\" /></svg>",
+        "copy": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect fill=\"none\" stroke=\"#000\" x=\"3.5\" y=\"2.5\" width=\"12\" height=\"16\" /> <polyline fill=\"none\" stroke=\"#000\" points=\"5 0.5 17.5 0.5 17.5 17\" /></svg>",
+        "credit-card": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect fill=\"none\" stroke=\"#000\" x=\"1.5\" y=\"4.5\" width=\"17\" height=\"12\" /> <rect x=\"1\" y=\"7\" width=\"18\" height=\"3\" /></svg>",
+        "database": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <ellipse fill=\"none\" stroke=\"#000\" cx=\"10\" cy=\"4.64\" rx=\"7.5\" ry=\"3.14\" /> <path fill=\"none\" stroke=\"#000\" d=\"M17.5,8.11 C17.5,9.85 14.14,11.25 10,11.25 C5.86,11.25 2.5,9.84 2.5,8.11\" /> <path fill=\"none\" stroke=\"#000\" d=\"M17.5,11.25 C17.5,12.99 14.14,14.39 10,14.39 C5.86,14.39 2.5,12.98 2.5,11.25\" /> <path fill=\"none\" stroke=\"#000\" d=\"M17.49,4.64 L17.5,14.36 C17.5,16.1 14.14,17.5 10,17.5 C5.86,17.5 2.5,16.09 2.5,14.36 L2.5,4.64\" /></svg>",
+        "desktop": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"8\" y=\"15\" width=\"1\" height=\"2\" /> <rect x=\"11\" y=\"15\" width=\"1\" height=\"2\" /> <rect x=\"5\" y=\"16\" width=\"10\" height=\"1\" /> <rect fill=\"none\" stroke=\"#000\" x=\"1.5\" y=\"3.5\" width=\"17\" height=\"11\" /></svg>",
+        "download": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" points=\"14,10 9.5,14.5 5,10\" /> <rect x=\"3\" y=\"17\" width=\"13\" height=\"1\" /> <line fill=\"none\" stroke=\"#000\" x1=\"9.5\" y1=\"13.91\" x2=\"9.5\" y2=\"3\" /></svg>",
+        "dribbble": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.4\" d=\"M1.3,8.9c0,0,5,0.1,8.6-1c1.4-0.4,2.6-0.9,4-1.9 c1.4-1.1,2.5-2.5,2.5-2.5\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.4\" d=\"M3.9,16.6c0,0,1.7-2.8,3.5-4.2 c1.8-1.3,4-2,5.7-2.2C16,10,19,10.6,19,10.6\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.4\" d=\"M6.9,1.6c0,0,3.3,4.6,4.2,6.8 c0.4,0.9,1.3,3.1,1.9,5.2c0.6,2,0.9,4.4,0.9,4.4\" /> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.4\" cx=\"10\" cy=\"10\" r=\"9\" /></svg>",
+        "expand": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"13 2 18 2 18 7 17 7 17 3 13 3\" /> <polygon points=\"2 13 3 13 3 17 7 17 7 18 2 18\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M11,9 L17,3\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M3,17 L9,11\" /></svg>",
+        "facebook": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M11,10h2.6l0.4-3H11V5.3c0-0.9,0.2-1.5,1.5-1.5H14V1.1c-0.3,0-1-0.1-2.1-0.1C9.6,1,8,2.4,8,5v2H5.5v3H8v8h3V10z\" /></svg>",
+        "file-edit": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" d=\"M18.65,1.68 C18.41,1.45 18.109,1.33 17.81,1.33 C17.499,1.33 17.209,1.45 16.98,1.68 L8.92,9.76 L8,12.33 L10.55,11.41 L18.651,3.34 C19.12,2.87 19.12,2.15 18.65,1.68 L18.65,1.68 L18.65,1.68 Z\" /> <polyline fill=\"none\" stroke=\"#000\" points=\"16.5 8.482 16.5 18.5 3.5 18.5 3.5 1.5 14.211 1.5\" /></svg>",
+        "file": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect fill=\"none\" stroke=\"#000\" x=\"3.5\" y=\"1.5\" width=\"13\" height=\"17\" /></svg>",
+        "flickr": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle cx=\"5.5\" cy=\"9.5\" r=\"3.5\" /> <circle cx=\"14.5\" cy=\"9.5\" r=\"3.5\" /></svg>",
+        "folder": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon fill=\"none\" stroke=\"#000\" points=\"9.5 5.5 8.5 3.5 1.5 3.5 1.5 16.5 18.5 16.5 18.5 5.5\" /></svg>",
+        "forward": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M2.47,13.11 C4.02,10.02 6.27,7.85 9.04,6.61 C9.48,6.41 10.27,6.13 11,5.91 L11,2 L18.89,9 L11,16 L11,12.13 C9.25,12.47 7.58,13.19 6.02,14.25 C3.03,16.28 1.63,18.54 1.63,18.54 C1.63,18.54 1.38,15.28 2.47,13.11 L2.47,13.11 Z M5.3,13.53 C6.92,12.4 9.04,11.4 12,10.92 L12,13.63 L17.36,9 L12,4.25 L12,6.8 C11.71,6.86 10.86,7.02 9.67,7.49 C6.79,8.65 4.58,10.96 3.49,13.08 C3.18,13.7 2.68,14.87 2.49,16 C3.28,15.05 4.4,14.15 5.3,13.53 L5.3,13.53 Z\" /></svg>",
+        "foursquare": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M15.23,2 C15.96,2 16.4,2.41 16.5,2.86 C16.57,3.15 16.56,3.44 16.51,3.73 C16.46,4.04 14.86,11.72 14.75,12.03 C14.56,12.56 14.16,12.82 13.61,12.83 C13.03,12.84 11.09,12.51 10.69,13 C10.38,13.38 7.79,16.39 6.81,17.53 C6.61,17.76 6.4,17.96 6.08,17.99 C5.68,18.04 5.29,17.87 5.17,17.45 C5.12,17.28 5.1,17.09 5.1,16.91 C5.1,12.4 4.86,7.81 5.11,3.31 C5.17,2.5 5.81,2.12 6.53,2 L15.23,2 L15.23,2 Z M9.76,11.42 C9.94,11.19 10.17,11.1 10.45,11.1 L12.86,11.1 C13.12,11.1 13.31,10.94 13.36,10.69 C13.37,10.64 13.62,9.41 13.74,8.83 C13.81,8.52 13.53,8.28 13.27,8.28 C12.35,8.29 11.42,8.28 10.5,8.28 C9.84,8.28 9.83,7.69 9.82,7.21 C9.8,6.85 10.13,6.55 10.5,6.55 C11.59,6.56 12.67,6.55 13.76,6.55 C14.03,6.55 14.23,6.4 14.28,6.14 C14.34,5.87 14.67,4.29 14.67,4.29 C14.67,4.29 14.82,3.74 14.19,3.74 L7.34,3.74 C7,3.75 6.84,4.02 6.84,4.33 C6.84,7.58 6.85,14.95 6.85,14.99 C6.87,15 8.89,12.51 9.76,11.42 L9.76,11.42 Z\" /></svg>",
+        "future": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline points=\"19 2 18 2 18 6 14 6 14 7 19 7 19 2\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M18,6.548 C16.709,3.29 13.354,1 9.6,1 C4.6,1 0.6,5 0.6,10 C0.6,15 4.6,19 9.6,19 C14.6,19 18.6,15 18.6,10\" /> <rect x=\"9\" y=\"4\" width=\"1\" height=\"7\" /> <path d=\"M13.018,14.197 L9.445,10.625\" fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" /></svg>",
+        "git-branch": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"7\" cy=\"3\" r=\"2\" /> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"14\" cy=\"6\" r=\"2\" /> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"7\" cy=\"17\" r=\"2\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"2\" d=\"M14,8 C14,10.41 12.43,10.87 10.56,11.25 C9.09,11.54 7,12.06 7,15 L7,5\" /></svg>",
+        "git-fork": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"5.79\" cy=\"2.79\" r=\"1.79\" /> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"14.19\" cy=\"2.79\" r=\"1.79\" /> <ellipse fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" cx=\"10.03\" cy=\"16.79\" rx=\"1.79\" ry=\"1.79\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"2\" d=\"M5.79,4.57 L5.79,6.56 C5.79,9.19 10.03,10.22 10.03,13.31 C10.03,14.86 10.04,14.55 10.04,14.55 C10.04,14.37 10.04,14.86 10.04,13.31 C10.04,10.22 14.2,9.19 14.2,6.56 L14.2,4.57\" /></svg>",
+        "github-alt": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M10,0.5 C4.75,0.5 0.5,4.76 0.5,10.01 C0.5,15.26 4.75,19.51 10,19.51 C15.24,19.51 19.5,15.26 19.5,10.01 C19.5,4.76 15.25,0.5 10,0.5 L10,0.5 Z M12.81,17.69 C12.81,17.69 12.81,17.7 12.79,17.69 C12.47,17.75 12.35,17.59 12.35,17.36 L12.35,16.17 C12.35,15.45 12.09,14.92 11.58,14.56 C12.2,14.51 12.77,14.39 13.26,14.21 C13.87,13.98 14.36,13.69 14.74,13.29 C15.42,12.59 15.76,11.55 15.76,10.17 C15.76,9.25 15.45,8.46 14.83,7.8 C15.1,7.08 15.07,6.29 14.75,5.44 L14.51,5.42 C14.34,5.4 14.06,5.46 13.67,5.61 C13.25,5.78 12.79,6.03 12.31,6.35 C11.55,6.16 10.81,6.05 10.09,6.05 C9.36,6.05 8.61,6.15 7.88,6.35 C7.28,5.96 6.75,5.68 6.26,5.54 C6.07,5.47 5.9,5.44 5.78,5.44 L5.42,5.44 C5.06,6.29 5.04,7.08 5.32,7.8 C4.7,8.46 4.4,9.25 4.4,10.17 C4.4,11.94 4.96,13.16 6.08,13.84 C6.53,14.13 7.05,14.32 7.69,14.43 C8.03,14.5 8.32,14.54 8.55,14.55 C8.07,14.89 7.82,15.42 7.82,16.16 L7.82,17.51 C7.8,17.69 7.7,17.8 7.51,17.8 C4.21,16.74 1.82,13.65 1.82,10.01 C1.82,5.5 5.49,1.83 10,1.83 C14.5,1.83 18.17,5.5 18.17,10.01 C18.18,13.53 15.94,16.54 12.81,17.69 L12.81,17.69 Z\" /></svg>",
+        "github": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M10,1 C5.03,1 1,5.03 1,10 C1,13.98 3.58,17.35 7.16,18.54 C7.61,18.62 7.77,18.34 7.77,18.11 C7.77,17.9 7.76,17.33 7.76,16.58 C5.26,17.12 4.73,15.37 4.73,15.37 C4.32,14.33 3.73,14.05 3.73,14.05 C2.91,13.5 3.79,13.5 3.79,13.5 C4.69,13.56 5.17,14.43 5.17,14.43 C5.97,15.8 7.28,15.41 7.79,15.18 C7.87,14.6 8.1,14.2 8.36,13.98 C6.36,13.75 4.26,12.98 4.26,9.53 C4.26,8.55 4.61,7.74 5.19,7.11 C5.1,6.88 4.79,5.97 5.28,4.73 C5.28,4.73 6.04,4.49 7.75,5.65 C8.47,5.45 9.24,5.35 10,5.35 C10.76,5.35 11.53,5.45 12.25,5.65 C13.97,4.48 14.72,4.73 14.72,4.73 C15.21,5.97 14.9,6.88 14.81,7.11 C15.39,7.74 15.73,8.54 15.73,9.53 C15.73,12.99 13.63,13.75 11.62,13.97 C11.94,14.25 12.23,14.8 12.23,15.64 C12.23,16.84 12.22,17.81 12.22,18.11 C12.22,18.35 12.38,18.63 12.84,18.54 C16.42,17.35 19,13.98 19,10 C19,5.03 14.97,1 10,1 L10,1 Z\" /></svg>",
+        "gitter": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"3.5\" y=\"1\" width=\"1.531\" height=\"11.471\" /> <rect x=\"7.324\" y=\"4.059\" width=\"1.529\" height=\"15.294\" /> <rect x=\"11.148\" y=\"4.059\" width=\"1.527\" height=\"15.294\" /> <rect x=\"14.971\" y=\"4.059\" width=\"1.529\" height=\"8.412\" /></svg>",
+        "google-plus": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M12.9,9c0,2.7-0.6,5-3.2,6.3c-3.7,1.8-8.1,0.2-9.4-3.6C-1.1,7.6,1.9,3.3,6.1,3c1.7-0.1,3.2,0.3,4.6,1.3 c0.1,0.1,0.3,0.2,0.4,0.4c-0.5,0.5-1.2,1-1.7,1.6c-1-0.8-2.1-1.1-3.5-0.9C5,5.6,4.2,6,3.6,6.7c-1.3,1.3-1.5,3.4-0.5,5 c1,1.7,2.6,2.3,4.6,1.9c1.4-0.3,2.4-1.2,2.6-2.6H6.9V9H12.9z\" /> <polygon points=\"20,9 20,11 18,11 18,13 16,13 16,11 14,11 14,9 16,9 16,7 18,7 18,9 \" /></svg>",
+        "google": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M17.86,9.09 C18.46,12.12 17.14,16.05 13.81,17.56 C9.45,19.53 4.13,17.68 2.47,12.87 C0.68,7.68 4.22,2.42 9.5,2.03 C11.57,1.88 13.42,2.37 15.05,3.65 C15.22,3.78 15.37,3.93 15.61,4.14 C14.9,4.81 14.23,5.45 13.5,6.14 C12.27,5.08 10.84,4.72 9.28,4.98 C8.12,5.17 7.16,5.76 6.37,6.63 C4.88,8.27 4.62,10.86 5.76,12.82 C6.95,14.87 9.17,15.8 11.57,15.25 C13.27,14.87 14.76,13.33 14.89,11.75 L10.51,11.75 L10.51,9.09 L17.86,9.09 L17.86,9.09 Z\" /></svg>",
+        "grid": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"2\" y=\"2\" width=\"3\" height=\"3\" /> <rect x=\"8\" y=\"2\" width=\"3\" height=\"3\" /> <rect x=\"14\" y=\"2\" width=\"3\" height=\"3\" /> <rect x=\"2\" y=\"8\" width=\"3\" height=\"3\" /> <rect x=\"8\" y=\"8\" width=\"3\" height=\"3\" /> <rect x=\"14\" y=\"8\" width=\"3\" height=\"3\" /> <rect x=\"2\" y=\"14\" width=\"3\" height=\"3\" /> <rect x=\"8\" y=\"14\" width=\"3\" height=\"3\" /> <rect x=\"14\" y=\"14\" width=\"3\" height=\"3\" /></svg>",
+        "happy": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle cx=\"13\" cy=\"7\" r=\"1\" /> <circle cx=\"7\" cy=\"7\" r=\"1\" /> <circle fill=\"none\" stroke=\"#000\" cx=\"10\" cy=\"10\" r=\"8.5\" /> <path fill=\"none\" stroke=\"#000\" d=\"M14.6,11.4 C13.9,13.3 12.1,14.5 10,14.5 C7.9,14.5 6.1,13.3 5.4,11.4\" /></svg>",
+        "hashtag": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M15.431,8 L15.661,7 L12.911,7 L13.831,3 L12.901,3 L11.98,7 L9.29,7 L10.21,3 L9.281,3 L8.361,7 L5.23,7 L5,8 L8.13,8 L7.21,12 L4.23,12 L4,13 L6.98,13 L6.061,17 L6.991,17 L7.911,13 L10.601,13 L9.681,17 L10.611,17 L11.531,13 L14.431,13 L14.661,12 L11.76,12 L12.681,8 L15.431,8 Z M10.831,12 L8.141,12 L9.061,8 L11.75,8 L10.831,12 Z\" /></svg>",
+        "heart": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.03\" d=\"M10,4 C10,4 8.1,2 5.74,2 C3.38,2 1,3.55 1,6.73 C1,8.84 2.67,10.44 2.67,10.44 L10,18 L17.33,10.44 C17.33,10.44 19,8.84 19,6.73 C19,3.55 16.62,2 14.26,2 C11.9,2 10,4 10,4 L10,4 Z\" /></svg>",
+        "history": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"#000\" points=\"1 2 2 2 2 6 6 6 6 7 1 7 1 2\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M2.1,6.548 C3.391,3.29 6.746,1 10.5,1 C15.5,1 19.5,5 19.5,10 C19.5,15 15.5,19 10.5,19 C5.5,19 1.5,15 1.5,10\" /> <rect x=\"9\" y=\"4\" width=\"1\" height=\"7\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M13.018,14.197 L9.445,10.625\" id=\"Shape\" /></svg>",
+        "home": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"18.65 11.35 10 2.71 1.35 11.35 0.65 10.65 10 1.29 19.35 10.65\" /> <polygon points=\"15 4 18 4 18 7 17 7 17 5 15 5\" /> <polygon points=\"3 11 4 11 4 18 7 18 7 12 12 12 12 18 16 18 16 11 17 11 17 19 11 19 11 13 8 13 8 19 3 19\" /></svg>",
+        "image": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle cx=\"16.1\" cy=\"6.1\" r=\"1.1\" /> <rect fill=\"none\" stroke=\"#000\" x=\"0.5\" y=\"2.5\" width=\"19\" height=\"15\" /> <polyline fill=\"none\" stroke=\"#000\" stroke-width=\"1.01\" points=\"4,13 8,9 13,14\" /> <polyline fill=\"none\" stroke=\"#000\" stroke-width=\"1.01\" points=\"11,12 12.5,10.5 16,14\" /></svg>",
+        "info": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M12.13,11.59 C11.97,12.84 10.35,14.12 9.1,14.16 C6.17,14.2 9.89,9.46 8.74,8.37 C9.3,8.16 10.62,7.83 10.62,8.81 C10.62,9.63 10.12,10.55 9.88,11.32 C8.66,15.16 12.13,11.15 12.14,11.18 C12.16,11.21 12.16,11.35 12.13,11.59 C12.08,11.95 12.16,11.35 12.13,11.59 L12.13,11.59 Z M11.56,5.67 C11.56,6.67 9.36,7.15 9.36,6.03 C9.36,5 11.56,4.54 11.56,5.67 L11.56,5.67 Z\" /> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"10\" cy=\"10\" r=\"9\" /></svg>",
+        "instagram": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M13.55,1H6.46C3.45,1,1,3.44,1,6.44v7.12c0,3,2.45,5.44,5.46,5.44h7.08c3.02,0,5.46-2.44,5.46-5.44V6.44 C19.01,3.44,16.56,1,13.55,1z M17.5,14c0,1.93-1.57,3.5-3.5,3.5H6c-1.93,0-3.5-1.57-3.5-3.5V6c0-1.93,1.57-3.5,3.5-3.5h8 c1.93,0,3.5,1.57,3.5,3.5V14z\" /> <circle cx=\"14.87\" cy=\"5.26\" r=\"1.09\" /> <path d=\"M10.03,5.45c-2.55,0-4.63,2.06-4.63,4.6c0,2.55,2.07,4.61,4.63,4.61c2.56,0,4.63-2.061,4.63-4.61 C14.65,7.51,12.58,5.45,10.03,5.45L10.03,5.45L10.03,5.45z M10.08,13c-1.66,0-3-1.34-3-2.99c0-1.65,1.34-2.99,3-2.99s3,1.34,3,2.99 C13.08,11.66,11.74,13,10.08,13L10.08,13L10.08,13z\" /></svg>",
+        "italic": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M12.63,5.48 L10.15,14.52 C10,15.08 10.37,15.25 11.92,15.3 L11.72,16 L6,16 L6.2,15.31 C7.78,15.26 8.19,15.09 8.34,14.53 L10.82,5.49 C10.97,4.92 10.63,4.76 9.09,4.71 L9.28,4 L15,4 L14.81,4.69 C13.23,4.75 12.78,4.91 12.63,5.48 L12.63,5.48 Z\" /></svg>",
+        "joomla": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M7.8,13.4l1.7-1.7L5.9,8c-0.6-0.5-0.6-1.5,0-2c0.6-0.6,1.4-0.6,2,0l1.7-1.7c-1-1-2.3-1.3-3.6-1C5.8,2.2,4.8,1.4,3.7,1.4 c-1.3,0-2.3,1-2.3,2.3c0,1.1,0.8,2,1.8,2.3c-0.4,1.3-0.1,2.8,1,3.8L7.8,13.4L7.8,13.4z\" /> <path d=\"M10.2,4.3c1-1,2.5-1.4,3.8-1c0.2-1.1,1.1-2,2.3-2c1.3,0,2.3,1,2.3,2.3c0,1.2-0.9,2.2-2,2.3c0.4,1.3,0,2.8-1,3.8L13.9,8 c0.6-0.5,0.6-1.5,0-2c-0.5-0.6-1.5-0.6-2,0L8.2,9.7L6.5,8\" /> <path d=\"M14.1,16.8c-1.3,0.4-2.8,0.1-3.8-1l1.7-1.7c0.6,0.6,1.5,0.6,2,0c0.5-0.6,0.6-1.5,0-2l-3.7-3.7L12,6.7l3.7,3.7 c1,1,1.3,2.4,1,3.6c1.1,0.2,2,1.1,2,2.3c0,1.3-1,2.3-2.3,2.3C15.2,18.6,14.3,17.8,14.1,16.8\" /> <path d=\"M13.2,12.2l-3.7,3.7c-1,1-2.4,1.3-3.6,1c-0.2,1-1.2,1.8-2.2,1.8c-1.3,0-2.3-1-2.3-2.3c0-1.1,0.8-2,1.8-2.3 c-0.3-1.3,0-2.7,1-3.7l1.7,1.7c-0.6,0.6-0.6,1.5,0,2c0.6,0.6,1.4,0.6,2,0l3.7-3.7\" /></svg>",
+        "laptop": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect y=\"16\" width=\"20\" height=\"1\" /> <rect fill=\"none\" stroke=\"#000\" x=\"2.5\" y=\"4.5\" width=\"15\" height=\"10\" /></svg>",
+        "lifesaver": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M10,0.5 C4.76,0.5 0.5,4.76 0.5,10 C0.5,15.24 4.76,19.5 10,19.5 C15.24,19.5 19.5,15.24 19.5,10 C19.5,4.76 15.24,0.5 10,0.5 L10,0.5 Z M10,1.5 C11.49,1.5 12.89,1.88 14.11,2.56 L11.85,4.82 C11.27,4.61 10.65,4.5 10,4.5 C9.21,4.5 8.47,4.67 7.79,4.96 L5.58,2.75 C6.87,1.95 8.38,1.5 10,1.5 L10,1.5 Z M4.96,7.8 C4.67,8.48 4.5,9.21 4.5,10 C4.5,10.65 4.61,11.27 4.83,11.85 L2.56,14.11 C1.88,12.89 1.5,11.49 1.5,10 C1.5,8.38 1.95,6.87 2.75,5.58 L4.96,7.79 L4.96,7.8 L4.96,7.8 Z M10,18.5 C8.25,18.5 6.62,17.97 5.27,17.06 L7.46,14.87 C8.22,15.27 9.08,15.5 10,15.5 C10.79,15.5 11.53,15.33 12.21,15.04 L14.42,17.25 C13.13,18.05 11.62,18.5 10,18.5 L10,18.5 Z M10,14.5 C7.52,14.5 5.5,12.48 5.5,10 C5.5,7.52 7.52,5.5 10,5.5 C12.48,5.5 14.5,7.52 14.5,10 C14.5,12.48 12.48,14.5 10,14.5 L10,14.5 Z M15.04,12.21 C15.33,11.53 15.5,10.79 15.5,10 C15.5,9.08 15.27,8.22 14.87,7.46 L17.06,5.27 C17.97,6.62 18.5,8.25 18.5,10 C18.5,11.62 18.05,13.13 17.25,14.42 L15.04,12.21 L15.04,12.21 Z\" /></svg>",
+        "link": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M10.625,12.375 L7.525,15.475 C6.825,16.175 5.925,16.175 5.225,15.475 L4.525,14.775 C3.825,14.074 3.825,13.175 4.525,12.475 L7.625,9.375\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M9.325,7.375 L12.425,4.275 C13.125,3.575 14.025,3.575 14.724,4.275 L15.425,4.975 C16.125,5.675 16.125,6.575 15.425,7.275 L12.325,10.375\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M7.925,11.875 L11.925,7.975\" /></svg>",
+        "linkedin": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M5.77,17.89 L5.77,7.17 L2.21,7.17 L2.21,17.89 L5.77,17.89 L5.77,17.89 Z M3.99,5.71 C5.23,5.71 6.01,4.89 6.01,3.86 C5.99,2.8 5.24,2 4.02,2 C2.8,2 2,2.8 2,3.85 C2,4.88 2.77,5.7 3.97,5.7 L3.99,5.7 L3.99,5.71 L3.99,5.71 Z\" /> <path d=\"M7.75,17.89 L11.31,17.89 L11.31,11.9 C11.31,11.58 11.33,11.26 11.43,11.03 C11.69,10.39 12.27,9.73 13.26,9.73 C14.55,9.73 15.06,10.71 15.06,12.15 L15.06,17.89 L18.62,17.89 L18.62,11.74 C18.62,8.45 16.86,6.92 14.52,6.92 C12.6,6.92 11.75,7.99 11.28,8.73 L11.3,8.73 L11.3,7.17 L7.75,7.17 C7.79,8.17 7.75,17.89 7.75,17.89 L7.75,17.89 L7.75,17.89 Z\" /></svg>",
+        "list": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"6\" y=\"4\" width=\"12\" height=\"1\" /> <rect x=\"6\" y=\"9\" width=\"12\" height=\"1\" /> <rect x=\"6\" y=\"14\" width=\"12\" height=\"1\" /> <rect x=\"2\" y=\"4\" width=\"2\" height=\"1\" /> <rect x=\"2\" y=\"9\" width=\"2\" height=\"1\" /> <rect x=\"2\" y=\"14\" width=\"2\" height=\"1\" /></svg>",
+        "location": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.01\" d=\"M10,0.5 C6.41,0.5 3.5,3.39 3.5,6.98 C3.5,11.83 10,19 10,19 C10,19 16.5,11.83 16.5,6.98 C16.5,3.39 13.59,0.5 10,0.5 L10,0.5 Z\" /> <circle fill=\"none\" stroke=\"#000\" cx=\"10\" cy=\"6.8\" r=\"2.3\" /></svg>",
+        "lock": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect fill=\"none\" stroke=\"#000\" height=\"10\" width=\"13\" y=\"8.5\" x=\"3.5\" /> <path fill=\"none\" stroke=\"#000\" d=\"M6.5,8 L6.5,4.88 C6.5,3.01 8.07,1.5 10,1.5 C11.93,1.5 13.5,3.01 13.5,4.88 L13.5,8\" /></svg>",
+        "mail": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" points=\"1.4,6.5 10,11 18.6,6.5\" /> <path d=\"M 1,4 1,16 19,16 19,4 1,4 Z M 18,15 2,15 2,5 18,5 18,15 Z\" /></svg>",
+        "menu": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"2\" y=\"4\" width=\"16\" height=\"1\" /> <rect x=\"2\" y=\"9\" width=\"16\" height=\"1\" /> <rect x=\"2\" y=\"14\" width=\"16\" height=\"1\" /></svg>",
+        "minus-circle": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"9.5\" cy=\"9.5\" r=\"9\" /> <line fill=\"none\" stroke=\"#000\" x1=\"5\" y1=\"9.5\" x2=\"14\" y2=\"9.5\" /></svg>",
+        "minus": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect height=\"1\" width=\"18\" y=\"9\" x=\"1\" /></svg>",
+        "more-vertical": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle cx=\"10\" cy=\"3\" r=\"2\" /> <circle cx=\"10\" cy=\"10\" r=\"2\" /> <circle cx=\"10\" cy=\"17\" r=\"2\" /></svg>",
+        "more": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle cx=\"3\" cy=\"10\" r=\"2\" /> <circle cx=\"10\" cy=\"10\" r=\"2\" /> <circle cx=\"17\" cy=\"10\" r=\"2\" /></svg>",
+        "move": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"4,5 1,5 1,9 2,9 2,6 4,6 \" /> <polygon points=\"1,16 2,16 2,18 4,18 4,19 1,19 \" /> <polygon points=\"14,16 14,19 11,19 11,18 13,18 13,16 \" /> <rect fill=\"none\" stroke=\"#000\" x=\"5.5\" y=\"1.5\" width=\"13\" height=\"13\" /> <rect x=\"1\" y=\"11\" width=\"1\" height=\"3\" /> <rect x=\"6\" y=\"18\" width=\"3\" height=\"1\" /></svg>",
+        "nut": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon fill=\"none\" stroke=\"#000\" points=\"2.5,5.7 10,1.3 17.5,5.7 17.5,14.3 10,18.7 2.5,14.3\" /> <circle fill=\"none\" stroke=\"#000\" cx=\"10\" cy=\"10\" r=\"3.5\" /></svg>",
+        "pagekit": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"3,1 17,1 17,16 10,16 10,13 14,13 14,4 6,4 6,16 10,16 10,19 3,19 \" /></svg>",
+        "paint-bucket": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M10.21,1 L0,11.21 L8.1,19.31 L18.31,9.1 L10.21,1 L10.21,1 Z M16.89,9.1 L15,11 L1.7,11 L10.21,2.42 L16.89,9.1 Z\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M6.42,2.33 L11.7,7.61\" /> <path d=\"M18.49,12 C18.49,12 20,14.06 20,15.36 C20,16.28 19.24,17 18.49,17 L18.49,17 C17.74,17 17,16.28 17,15.36 C17,14.06 18.49,12 18.49,12 L18.49,12 Z\" /></svg>",
+        "pencil": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" d=\"M17.25,6.01 L7.12,16.1 L3.82,17.2 L5.02,13.9 L15.12,3.88 C15.71,3.29 16.66,3.29 17.25,3.88 C17.83,4.47 17.83,5.42 17.25,6.01 L17.25,6.01 Z\" /> <path fill=\"none\" stroke=\"#000\" d=\"M15.98,7.268 L13.851,5.148\" /></svg>",
+        "phone-landscape": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" d=\"M17,5.5 C17.8,5.5 18.5,6.2 18.5,7 L18.5,14 C18.5,14.8 17.8,15.5 17,15.5 L3,15.5 C2.2,15.5 1.5,14.8 1.5,14 L1.5,7 C1.5,6.2 2.2,5.5 3,5.5 L17,5.5 L17,5.5 L17,5.5 Z\" /> <circle cx=\"3.8\" cy=\"10.5\" r=\"0.8\" /></svg>",
+        "phone": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" d=\"M15.5,17 C15.5,17.8 14.8,18.5 14,18.5 L7,18.5 C6.2,18.5 5.5,17.8 5.5,17 L5.5,3 C5.5,2.2 6.2,1.5 7,1.5 L14,1.5 C14.8,1.5 15.5,2.2 15.5,3 L15.5,17 L15.5,17 L15.5,17 Z\" /> <circle cx=\"10.5\" cy=\"16.5\" r=\"0.8\" /></svg>",
+        "pinterest": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M10.21,1 C5.5,1 3,4.16 3,7.61 C3,9.21 3.85,11.2 5.22,11.84 C5.43,11.94 5.54,11.89 5.58,11.69 C5.62,11.54 5.8,10.8 5.88,10.45 C5.91,10.34 5.89,10.24 5.8,10.14 C5.36,9.59 5,8.58 5,7.65 C5,5.24 6.82,2.91 9.93,2.91 C12.61,2.91 14.49,4.74 14.49,7.35 C14.49,10.3 13,12.35 11.06,12.35 C9.99,12.35 9.19,11.47 9.44,10.38 C9.75,9.08 10.35,7.68 10.35,6.75 C10.35,5.91 9.9,5.21 8.97,5.21 C7.87,5.21 6.99,6.34 6.99,7.86 C6.99,8.83 7.32,9.48 7.32,9.48 C7.32,9.48 6.24,14.06 6.04,14.91 C5.7,16.35 6.08,18.7 6.12,18.9 C6.14,19.01 6.26,19.05 6.33,18.95 C6.44,18.81 7.74,16.85 8.11,15.44 C8.24,14.93 8.79,12.84 8.79,12.84 C9.15,13.52 10.19,14.09 11.29,14.09 C14.58,14.09 16.96,11.06 16.96,7.3 C16.94,3.7 14,1 10.21,1\" /></svg>",
+        "play-circle": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" points=\"8.5 7 13.5 10 8.5 13\" /> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"10\" cy=\"10\" r=\"9\" /></svg>",
+        "play": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon fill=\"none\" stroke=\"#000\" points=\"6.5,5 14.5,10 6.5,15\" /></svg>",
+        "plus-circle": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"9.5\" cy=\"9.5\" r=\"9\" /> <line fill=\"none\" stroke=\"#000\" x1=\"9.5\" y1=\"5\" x2=\"9.5\" y2=\"14\" /> <line fill=\"none\" stroke=\"#000\" x1=\"5\" y1=\"9.5\" x2=\"14\" y2=\"9.5\" /></svg>",
+        "plus": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"9\" y=\"1\" width=\"1\" height=\"17\" /> <rect x=\"1\" y=\"9\" width=\"17\" height=\"1\" /></svg>",
+        "pull": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"6.85,8 9.5,10.6 12.15,8 12.85,8.7 9.5,12 6.15,8.7\" /> <line fill=\"none\" stroke=\"#000\" x1=\"9.5\" y1=\"11\" x2=\"9.5\" y2=\"2\" /> <polyline fill=\"none\" stroke=\"#000\" points=\"6,5.5 3.5,5.5 3.5,18.5 15.5,18.5 15.5,5.5 13,5.5\" /></svg>",
+        "push": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"12.15,4 9.5,1.4 6.85,4 6.15,3.3 9.5,0 12.85,3.3\" /> <line fill=\"none\" stroke=\"#000\" x1=\"9.5\" y1=\"10\" x2=\"9.5\" y2=\"1\" /> <polyline fill=\"none\" stroke=\"#000\" points=\"6 5.5 3.5 5.5 3.5 18.5 15.5 18.5 15.5 5.5 13 5.5\" /></svg>",
+        "question": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"10\" cy=\"10\" r=\"9\" /> <circle cx=\"10.44\" cy=\"14.42\" r=\"1.05\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.2\" d=\"M8.17,7.79 C8.17,4.75 12.72,4.73 12.72,7.72 C12.72,8.67 11.81,9.15 11.23,9.75 C10.75,10.24 10.51,10.73 10.45,11.4 C10.44,11.53 10.43,11.64 10.43,11.75\" /></svg>",
+        "quote-right": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M17.27,7.79 C17.27,9.45 16.97,10.43 15.99,12.02 C14.98,13.64 13,15.23 11.56,15.97 L11.1,15.08 C12.34,14.2 13.14,13.51 14.02,11.82 C14.27,11.34 14.41,10.92 14.49,10.54 C14.3,10.58 14.09,10.6 13.88,10.6 C12.06,10.6 10.59,9.12 10.59,7.3 C10.59,5.48 12.06,4 13.88,4 C15.39,4 16.67,5.02 17.05,6.42 C17.19,6.82 17.27,7.27 17.27,7.79 L17.27,7.79 Z\" /> <path d=\"M8.68,7.79 C8.68,9.45 8.38,10.43 7.4,12.02 C6.39,13.64 4.41,15.23 2.97,15.97 L2.51,15.08 C3.75,14.2 4.55,13.51 5.43,11.82 C5.68,11.34 5.82,10.92 5.9,10.54 C5.71,10.58 5.5,10.6 5.29,10.6 C3.47,10.6 2,9.12 2,7.3 C2,5.48 3.47,4 5.29,4 C6.8,4 8.08,5.02 8.46,6.42 C8.6,6.82 8.68,7.27 8.68,7.79 L8.68,7.79 Z\" /></svg>",
+        "receiver": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.01\" d=\"M6.189,13.611C8.134,15.525 11.097,18.239 13.867,18.257C16.47,18.275 18.2,16.241 18.2,16.241L14.509,12.551L11.539,13.639L6.189,8.29L7.313,5.355L3.76,1.8C3.76,1.8 1.732,3.537 1.7,6.092C1.667,8.809 4.347,11.738 6.189,13.611\" /></svg>",
+        "refresh": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M17.08,11.15 C17.09,11.31 17.1,11.47 17.1,11.64 C17.1,15.53 13.94,18.69 10.05,18.69 C6.16,18.68 3,15.53 3,11.63 C3,7.74 6.16,4.58 10.05,4.58 C10.9,4.58 11.71,4.73 12.46,5\" /> <polyline fill=\"none\" stroke=\"#000\" points=\"9.9 2 12.79 4.89 9.79 7.9\" /></svg>",
+        "reply": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M17.7,13.11 C16.12,10.02 13.84,7.85 11.02,6.61 C10.57,6.41 9.75,6.13 9,5.91 L9,2 L1,9 L9,16 L9,12.13 C10.78,12.47 12.5,13.19 14.09,14.25 C17.13,16.28 18.56,18.54 18.56,18.54 C18.56,18.54 18.81,15.28 17.7,13.11 L17.7,13.11 Z M14.82,13.53 C13.17,12.4 11.01,11.4 8,10.92 L8,13.63 L2.55,9 L8,4.25 L8,6.8 C8.3,6.86 9.16,7.02 10.37,7.49 C13.3,8.65 15.54,10.96 16.65,13.08 C16.97,13.7 17.48,14.86 17.68,16 C16.87,15.05 15.73,14.15 14.82,13.53 L14.82,13.53 Z\" /></svg>",
+        "rss": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle cx=\"3.12\" cy=\"16.8\" r=\"1.85\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M1.5,8.2 C1.78,8.18 2.06,8.16 2.35,8.16 C7.57,8.16 11.81,12.37 11.81,17.57 C11.81,17.89 11.79,18.19 11.76,18.5\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M1.5,2.52 C1.78,2.51 2.06,2.5 2.35,2.5 C10.72,2.5 17.5,9.24 17.5,17.57 C17.5,17.89 17.49,18.19 17.47,18.5\" /></svg>",
+        "search": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"9\" cy=\"9\" r=\"7\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M14,14 L18,18 L14,14 Z\" /></svg>",
+        "server": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"3\" y=\"3\" width=\"1\" height=\"2\" /> <rect x=\"5\" y=\"3\" width=\"1\" height=\"2\" /> <rect x=\"7\" y=\"3\" width=\"1\" height=\"2\" /> <rect x=\"16\" y=\"3\" width=\"1\" height=\"1\" /> <rect x=\"16\" y=\"10\" width=\"1\" height=\"1\" /> <circle fill=\"none\" stroke=\"#000\" cx=\"9.9\" cy=\"17.4\" r=\"1.4\" /> <rect x=\"3\" y=\"10\" width=\"1\" height=\"2\" /> <rect x=\"5\" y=\"10\" width=\"1\" height=\"2\" /> <rect x=\"9.5\" y=\"14\" width=\"1\" height=\"2\" /> <rect x=\"3\" y=\"17\" width=\"6\" height=\"1\" /> <rect x=\"11\" y=\"17\" width=\"6\" height=\"1\" /> <rect fill=\"none\" stroke=\"#000\" x=\"1.5\" y=\"1.5\" width=\"17\" height=\"5\" /> <rect fill=\"none\" stroke=\"#000\" x=\"1.5\" y=\"8.5\" width=\"17\" height=\"5\" /></svg>",
+        "settings": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <ellipse fill=\"none\" stroke=\"#000\" cx=\"6.11\" cy=\"3.55\" rx=\"2.11\" ry=\"2.15\" /> <ellipse fill=\"none\" stroke=\"#000\" cx=\"6.11\" cy=\"15.55\" rx=\"2.11\" ry=\"2.15\" /> <circle fill=\"none\" stroke=\"#000\" cx=\"13.15\" cy=\"9.55\" r=\"2.15\" /> <rect x=\"1\" y=\"3\" width=\"3\" height=\"1\" /> <rect x=\"10\" y=\"3\" width=\"8\" height=\"1\" /> <rect x=\"1\" y=\"9\" width=\"8\" height=\"1\" /> <rect x=\"15\" y=\"9\" width=\"3\" height=\"1\" /> <rect x=\"1\" y=\"15\" width=\"3\" height=\"1\" /> <rect x=\"10\" y=\"15\" width=\"8\" height=\"1\" /></svg>",
+        "shrink": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"11 4 12 4 12 8 16 8 16 9 11 9\" /> <polygon points=\"4 11 9 11 9 16 8 16 8 12 4 12\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M12,8 L18,2\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M2,18 L8,12\" /></svg>",
+        "sign-in": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"7 2 17 2 17 17 7 17 7 16 16 16 16 3 7 3\" /> <polygon points=\"9.1 13.4 8.5 12.8 11.28 10 4 10 4 9 11.28 9 8.5 6.2 9.1 5.62 13 9.5\" /></svg>",
+        "sign-out": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"13.1 13.4 12.5 12.8 15.28 10 8 10 8 9 15.28 9 12.5 6.2 13.1 5.62 17 9.5\" /> <polygon points=\"13 2 3 2 3 17 13 17 13 16 4 16 4 3 13 3\" /></svg>",
+        "social": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <line fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" x1=\"13.4\" y1=\"14\" x2=\"6.3\" y2=\"10.7\" /> <line fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" x1=\"13.5\" y1=\"5.5\" x2=\"6.5\" y2=\"8.8\" /> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"15.5\" cy=\"4.6\" r=\"2.3\" /> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"15.5\" cy=\"14.8\" r=\"2.3\" /> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"4.5\" cy=\"9.8\" r=\"2.3\" /></svg>",
+        "soundcloud": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M17.2,9.4c-0.4,0-0.8,0.1-1.101,0.2c-0.199-2.5-2.399-4.5-5-4.5c-0.6,0-1.2,0.1-1.7,0.3C9.2,5.5,9.1,5.6,9.1,5.6V15h8 c1.601,0,2.801-1.2,2.801-2.8C20,10.7,18.7,9.4,17.2,9.4L17.2,9.4z\" /> <rect x=\"6\" y=\"6.5\" width=\"1.5\" height=\"8.5\" /> <rect x=\"3\" y=\"8\" width=\"1.5\" height=\"7\" /> <rect y=\"10\" width=\"1.5\" height=\"5\" /></svg>",
+        "star": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon fill=\"none\" stroke=\"#000\" stroke-width=\"1.01\" points=\"10 2 12.63 7.27 18.5 8.12 14.25 12.22 15.25 18 10 15.27 4.75 18 5.75 12.22 1.5 8.12 7.37 7.27\" /></svg>",
+        "strikethrough": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M6,13.02 L6.65,13.02 C7.64,15.16 8.86,16.12 10.41,16.12 C12.22,16.12 12.92,14.93 12.92,13.89 C12.92,12.55 11.99,12.03 9.74,11.23 C8.05,10.64 6.23,10.11 6.23,7.83 C6.23,5.5 8.09,4.09 10.4,4.09 C11.44,4.09 12.13,4.31 12.72,4.54 L13.33,4 L13.81,4 L13.81,7.59 L13.16,7.59 C12.55,5.88 11.52,4.89 10.07,4.89 C8.84,4.89 7.89,5.69 7.89,7.03 C7.89,8.29 8.89,8.78 10.88,9.45 C12.57,10.03 14.38,10.6 14.38,12.91 C14.38,14.75 13.27,16.93 10.18,16.93 C9.18,16.93 8.17,16.69 7.46,16.39 L6.52,17 L6,17 L6,13.02 L6,13.02 Z\" /> <rect x=\"3\" y=\"10\" width=\"15\" height=\"1\" /></svg>",
+        "table": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"1\" y=\"3\" width=\"18\" height=\"1\" /> <rect x=\"1\" y=\"7\" width=\"18\" height=\"1\" /> <rect x=\"1\" y=\"11\" width=\"18\" height=\"1\" /> <rect x=\"1\" y=\"15\" width=\"18\" height=\"1\" /></svg>",
+        "tablet-landscape": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" d=\"M1.5,5 C1.5,4.2 2.2,3.5 3,3.5 L17,3.5 C17.8,3.5 18.5,4.2 18.5,5 L18.5,16 C18.5,16.8 17.8,17.5 17,17.5 L3,17.5 C2.2,17.5 1.5,16.8 1.5,16 L1.5,5 L1.5,5 L1.5,5 Z\" /> <circle cx=\"3.7\" cy=\"10.5\" r=\"0.8\" /></svg>",
+        "tablet": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" d=\"M5,18.5 C4.2,18.5 3.5,17.8 3.5,17 L3.5,3 C3.5,2.2 4.2,1.5 5,1.5 L16,1.5 C16.8,1.5 17.5,2.2 17.5,3 L17.5,17 C17.5,17.8 16.8,18.5 16,18.5 L5,18.5 L5,18.5 L5,18.5 Z\" /> <circle cx=\"10.5\" cy=\"16.3\" r=\"0.8\" /></svg>",
+        "tag": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M17.5,3.71 L17.5,7.72 C17.5,7.96 17.4,8.2 17.21,8.39 L8.39,17.2 C7.99,17.6 7.33,17.6 6.93,17.2 L2.8,13.07 C2.4,12.67 2.4,12.01 2.8,11.61 L11.61,2.8 C11.81,2.6 12.08,2.5 12.34,2.5 L16.19,2.5 C16.52,2.5 16.86,2.63 17.11,2.88 C17.35,3.11 17.48,3.4 17.5,3.71 L17.5,3.71 Z\" /> <circle cx=\"14\" cy=\"6\" r=\"1\" /></svg>",
+        "thumbnails": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect fill=\"none\" stroke=\"#000\" x=\"3.5\" y=\"3.5\" width=\"5\" height=\"5\" /> <rect fill=\"none\" stroke=\"#000\" x=\"11.5\" y=\"3.5\" width=\"5\" height=\"5\" /> <rect fill=\"none\" stroke=\"#000\" x=\"11.5\" y=\"11.5\" width=\"5\" height=\"5\" /> <rect fill=\"none\" stroke=\"#000\" x=\"3.5\" y=\"11.5\" width=\"5\" height=\"5\" /></svg>",
+        "trash": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" points=\"6.5 3 6.5 1.5 13.5 1.5 13.5 3\" /> <polyline fill=\"none\" stroke=\"#000\" points=\"4.5 4 4.5 18.5 15.5 18.5 15.5 4\" /> <rect x=\"8\" y=\"7\" width=\"1\" height=\"9\" /> <rect x=\"11\" y=\"7\" width=\"1\" height=\"9\" /> <rect x=\"2\" y=\"3\" width=\"16\" height=\"1\" /></svg>",
+        "triangle-down": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"5 7 15 7 10 12\" /></svg>",
+        "triangle-left": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"12 5 7 10 12 15\" /></svg>",
+        "triangle-right": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"8 5 13 10 8 15\" /></svg>",
+        "triangle-up": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"5 13 10 8 15 13\" /></svg>",
+        "tripadvisor": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M19.021,7.866C19.256,6.862,20,5.854,20,5.854h-3.346C14.781,4.641,12.504,4,9.98,4C7.363,4,4.999,4.651,3.135,5.876H0\tc0,0,0.738,0.987,0.976,1.988c-0.611,0.837-0.973,1.852-0.973,2.964c0,2.763,2.249,5.009,5.011,5.009\tc1.576,0,2.976-0.737,3.901-1.879l1.063,1.599l1.075-1.615c0.475,0.611,1.1,1.111,1.838,1.451c1.213,0.547,2.574,0.612,3.825,0.15\tc2.589-0.963,3.913-3.852,2.964-6.439c-0.175-0.463-0.4-0.876-0.675-1.238H19.021z M16.38,14.594\tc-1.002,0.371-2.088,0.328-3.06-0.119c-0.688-0.317-1.252-0.817-1.657-1.438c-0.164-0.25-0.313-0.52-0.417-0.811\tc-0.124-0.328-0.186-0.668-0.217-1.014c-0.063-0.689,0.037-1.396,0.339-2.043c0.448-0.971,1.251-1.71,2.25-2.079\tc2.075-0.765,4.375,0.3,5.14,2.366c0.762,2.066-0.301,4.37-2.363,5.134L16.38,14.594L16.38,14.594z M8.322,13.066\tc-0.72,1.059-1.935,1.76-3.309,1.76c-2.207,0-4.001-1.797-4.001-3.996c0-2.203,1.795-4.002,4.001-4.002\tc2.204,0,3.999,1.8,3.999,4.002c0,0.137-0.024,0.261-0.04,0.396c-0.067,0.678-0.284,1.313-0.648,1.853v-0.013H8.322z M2.472,10.775\tc0,1.367,1.112,2.479,2.476,2.479c1.363,0,2.472-1.11,2.472-2.479c0-1.359-1.11-2.468-2.472-2.468\tC3.584,8.306,2.473,9.416,2.472,10.775L2.472,10.775z M12.514,10.775c0,1.367,1.104,2.479,2.471,2.479\tc1.363,0,2.474-1.108,2.474-2.479c0-1.359-1.11-2.468-2.474-2.468c-1.364,0-2.477,1.109-2.477,2.468H12.514z M3.324,10.775\tc0-0.893,0.726-1.618,1.614-1.618c0.889,0,1.625,0.727,1.625,1.618c0,0.898-0.725,1.627-1.625,1.627\tc-0.901,0-1.625-0.729-1.625-1.627H3.324z M13.354,10.775c0-0.893,0.726-1.618,1.627-1.618c0.886,0,1.61,0.727,1.61,1.618\tc0,0.898-0.726,1.627-1.626,1.627s-1.625-0.729-1.625-1.627H13.354z M9.977,4.875c1.798,0,3.425,0.324,4.849,0.968\tc-0.535,0.015-1.061,0.108-1.586,0.3c-1.264,0.463-2.264,1.388-2.815,2.604c-0.262,0.551-0.398,1.133-0.448,1.72\tC9.79,7.905,7.677,5.873,5.076,5.82C6.501,5.208,8.153,4.875,9.94,4.875H9.977z\" /></svg>",
+        "tumblr": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M6.885,8.598c0,0,0,3.393,0,4.996c0,0.282,0,0.66,0.094,0.942c0.377,1.509,1.131,2.545,2.545,3.11 c1.319,0.472,2.356,0.472,3.676,0c0.565-0.188,1.132-0.659,1.132-0.659l-0.849-2.263c0,0-1.036,0.378-1.603,0.283 c-0.565-0.094-1.226-0.66-1.226-1.508c0-1.603,0-4.902,0-4.902h2.828V5.771h-2.828V2H8.205c0,0-0.094,0.66-0.188,0.942 C7.828,3.791,7.262,4.733,6.603,5.394C5.848,6.147,5,6.43,5,6.43v2.168H6.885z\" /></svg>",
+        "tv": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect x=\"7\" y=\"16\" width=\"6\" height=\"1\" /> <rect fill=\"none\" stroke=\"#000\" x=\"0.5\" y=\"3.5\" width=\"19\" height=\"11\" /></svg>",
+        "twitter": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M19,4.74 C18.339,5.029 17.626,5.229 16.881,5.32 C17.644,4.86 18.227,4.139 18.503,3.28 C17.79,3.7 17.001,4.009 16.159,4.17 C15.485,3.45 14.526,3 13.464,3 C11.423,3 9.771,4.66 9.771,6.7 C9.771,6.99 9.804,7.269 9.868,7.539 C6.795,7.38 4.076,5.919 2.254,3.679 C1.936,4.219 1.754,4.86 1.754,5.539 C1.754,6.82 2.405,7.95 3.397,8.61 C2.79,8.589 2.22,8.429 1.723,8.149 L1.723,8.189 C1.723,9.978 2.997,11.478 4.686,11.82 C4.376,11.899 4.049,11.939 3.713,11.939 C3.475,11.939 3.245,11.919 3.018,11.88 C3.49,13.349 4.852,14.419 6.469,14.449 C5.205,15.429 3.612,16.019 1.882,16.019 C1.583,16.019 1.29,16.009 1,15.969 C2.635,17.019 4.576,17.629 6.662,17.629 C13.454,17.629 17.17,12 17.17,7.129 C17.17,6.969 17.166,6.809 17.157,6.649 C17.879,6.129 18.504,5.478 19,4.74\" /></svg>",
+        "uikit": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"14.4,3.1 11.3,5.1 15,7.3 15,12.9 10,15.7 5,12.9 5,8.5 2,6.8 2,14.8 9.9,19.5 18,14.8 18,5.3\" /> <polygon points=\"9.8,4.2 6.7,2.4 9.8,0.4 12.9,2.3\" /></svg>",
+        "unlock": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <rect fill=\"none\" stroke=\"#000\" x=\"3.5\" y=\"8.5\" width=\"13\" height=\"10\" /> <path fill=\"none\" stroke=\"#000\" d=\"M6.5,8.5 L6.5,4.9 C6.5,3 8.1,1.5 10,1.5 C11.9,1.5 13.5,3 13.5,4.9\" /></svg>",
+        "upload": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polyline fill=\"none\" stroke=\"#000\" points=\"5 8 9.5 3.5 14 8 \" /> <rect x=\"3\" y=\"17\" width=\"13\" height=\"1\" /> <line fill=\"none\" stroke=\"#000\" x1=\"9.5\" y1=\"15\" x2=\"9.5\" y2=\"4\" /></svg>",
+        "user": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"9.9\" cy=\"6.4\" r=\"4.4\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2\" /></svg>",
+        "users": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"7.7\" cy=\"8.6\" r=\"3.5\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M1,18.1 C1.7,14.6 4.4,12.1 7.6,12.1 C10.9,12.1 13.7,14.8 14.3,18.3\" /> <path fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" d=\"M11.4,4 C12.8,2.4 15.4,2.8 16.3,4.7 C17.2,6.6 15.7,8.9 13.6,8.9 C16.5,8.9 18.8,11.3 19.2,14.1\" /></svg>",
+        "video-camera": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <polygon points=\"18,6 18,14 12,10 \" /> <rect x=\"2\" y=\"5\" width=\"12\" height=\"10\" /></svg>",
+        "vimeo": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M2.065,7.59C1.84,7.367,1.654,7.082,1.468,6.838c-0.332-0.42-0.137-0.411,0.274-0.772c1.026-0.91,2.004-1.896,3.127-2.688 c1.017-0.713,2.365-1.173,3.286-0.039c0.849,1.045,0.869,2.629,1.084,3.891c0.215,1.309,0.421,2.648,0.88,3.901 c0.127,0.352,0.37,1.018,0.81,1.074c0.567,0.078,1.145-0.917,1.408-1.289c0.684-0.987,1.611-2.317,1.494-3.587 c-0.115-1.349-1.572-1.095-2.482-0.773c0.146-1.514,1.555-3.216,2.912-3.792c1.439-0.597,3.579-0.587,4.302,1.036 c0.772,1.759,0.078,3.802-0.763,5.396c-0.918,1.731-2.1,3.333-3.363,4.829c-1.114,1.329-2.432,2.787-4.093,3.422 c-1.897,0.723-3.021-0.686-3.667-2.318c-0.705-1.777-1.056-3.771-1.565-5.621C4.898,8.726,4.644,7.836,4.136,7.191 C3.473,6.358,2.72,7.141,2.065,7.59C1.977,7.502,2.115,7.551,2.065,7.59L2.065,7.59z\" /></svg>",
+        "warning": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <circle cx=\"10\" cy=\"14\" r=\"1\" /> <circle fill=\"none\" stroke=\"#000\" stroke-width=\"1.1\" cx=\"10\" cy=\"10\" r=\"9\" /> <path d=\"M10.97,7.72 C10.85,9.54 10.56,11.29 10.56,11.29 C10.51,11.87 10.27,12 9.99,12 C9.69,12 9.49,11.87 9.43,11.29 C9.43,11.29 9.16,9.54 9.03,7.72 C8.96,6.54 9.03,6 9.03,6 C9.03,5.45 9.46,5.02 9.99,5 C10.53,5.01 10.97,5.44 10.97,6 C10.97,6 11.04,6.54 10.97,7.72 L10.97,7.72 Z\" /></svg>",
+        "whatsapp": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M16.7,3.3c-1.8-1.8-4.1-2.8-6.7-2.8c-5.2,0-9.4,4.2-9.4,9.4c0,1.7,0.4,3.3,1.3,4.7l-1.3,4.9l5-1.3c1.4,0.8,2.9,1.2,4.5,1.2 l0,0l0,0c5.2,0,9.4-4.2,9.4-9.4C19.5,7.4,18.5,5,16.7,3.3 M10.1,17.7L10.1,17.7c-1.4,0-2.8-0.4-4-1.1l-0.3-0.2l-3,0.8l0.8-2.9 l-0.2-0.3c-0.8-1.2-1.2-2.7-1.2-4.2c0-4.3,3.5-7.8,7.8-7.8c2.1,0,4.1,0.8,5.5,2.3c1.5,1.5,2.3,3.4,2.3,5.5 C17.9,14.2,14.4,17.7,10.1,17.7 M14.4,11.9c-0.2-0.1-1.4-0.7-1.6-0.8c-0.2-0.1-0.4-0.1-0.5,0.1c-0.2,0.2-0.6,0.8-0.8,0.9 c-0.1,0.2-0.3,0.2-0.5,0.1c-0.2-0.1-1-0.4-1.9-1.2c-0.7-0.6-1.2-1.4-1.3-1.6c-0.1-0.2,0-0.4,0.1-0.5C8,8.8,8.1,8.7,8.2,8.5 c0.1-0.1,0.2-0.2,0.2-0.4c0.1-0.2,0-0.3,0-0.4C8.4,7.6,7.9,6.5,7.7,6C7.5,5.5,7.3,5.6,7.2,5.6c-0.1,0-0.3,0-0.4,0 c-0.2,0-0.4,0.1-0.6,0.3c-0.2,0.2-0.8,0.8-0.8,2c0,1.2,0.8,2.3,1,2.4c0.1,0.2,1.7,2.5,4,3.5c0.6,0.2,1,0.4,1.3,0.5 c0.6,0.2,1.1,0.2,1.5,0.1c0.5-0.1,1.4-0.6,1.6-1.1c0.2-0.5,0.2-1,0.1-1.1C14.8,12.1,14.6,12,14.4,11.9\" /></svg>",
+        "wordpress": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M10,0.5c-5.2,0-9.5,4.3-9.5,9.5s4.3,9.5,9.5,9.5c5.2,0,9.5-4.3,9.5-9.5S15.2,0.5,10,0.5L10,0.5L10,0.5z M15.6,3.9h-0.1 c-0.8,0-1.4,0.7-1.4,1.5c0,0.7,0.4,1.3,0.8,1.9c0.3,0.6,0.7,1.3,0.7,2.3c0,0.7-0.3,1.5-0.6,2.7L14.1,15l-3-8.9 c0.5,0,0.9-0.1,0.9-0.1C12.5,6,12.5,5.3,12,5.4c0,0-1.3,0.1-2.2,0.1C9,5.5,7.7,5.4,7.7,5.4C7.2,5.3,7.2,6,7.6,6c0,0,0.4,0.1,0.9,0.1 l1.3,3.5L8,15L5,6.1C5.5,6.1,5.9,6,5.9,6C6.4,6,6.3,5.3,5.9,5.4c0,0-1.3,0.1-2.2,0.1c-0.2,0-0.3,0-0.5,0c1.5-2.2,4-3.7,6.9-3.7 C12.2,1.7,14.1,2.6,15.6,3.9L15.6,3.9L15.6,3.9z M2.5,6.6l3.9,10.8c-2.7-1.3-4.6-4.2-4.6-7.4C1.8,8.8,2,7.6,2.5,6.6L2.5,6.6L2.5,6.6 z M10.2,10.7l2.5,6.9c0,0,0,0.1,0.1,0.1C11.9,18,11,18.2,10,18.2c-0.8,0-1.6-0.1-2.3-0.3L10.2,10.7L10.2,10.7L10.2,10.7z M14.2,17.1 l2.5-7.3c0.5-1.2,0.6-2.1,0.6-2.9c0-0.3,0-0.6-0.1-0.8c0.6,1.2,1,2.5,1,4C18.3,13,16.6,15.7,14.2,17.1L14.2,17.1L14.2,17.1z\" /></svg>",
+        "world": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path fill=\"none\" stroke=\"#000\" d=\"M1,10.5 L19,10.5\" /> <path fill=\"none\" stroke=\"#000\" d=\"M2.35,15.5 L17.65,15.5\" /> <path fill=\"none\" stroke=\"#000\" d=\"M2.35,5.5 L17.523,5.5\" /> <path fill=\"none\" stroke=\"#000\" d=\"M10,19.46 L9.98,19.46 C7.31,17.33 5.61,14.141 5.61,10.58 C5.61,7.02 7.33,3.83 10,1.7 C10.01,1.7 9.99,1.7 10,1.7 L10,1.7 C12.67,3.83 14.4,7.02 14.4,10.58 C14.4,14.141 12.67,17.33 10,19.46 L10,19.46 L10,19.46 L10,19.46 Z\" /> <circle fill=\"none\" stroke=\"#000\" cx=\"10\" cy=\"10.5\" r=\"9\" /></svg>",
+        "xing": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M4.4,4.56 C4.24,4.56 4.11,4.61 4.05,4.72 C3.98,4.83 3.99,4.97 4.07,5.12 L5.82,8.16 L5.82,8.17 L3.06,13.04 C2.99,13.18 2.99,13.33 3.06,13.44 C3.12,13.55 3.24,13.62 3.4,13.62 L6,13.62 C6.39,13.62 6.57,13.36 6.71,13.12 C6.71,13.12 9.41,8.35 9.51,8.16 C9.49,8.14 7.72,5.04 7.72,5.04 C7.58,4.81 7.39,4.56 6.99,4.56 L4.4,4.56 L4.4,4.56 Z\" /> <path d=\"M15.3,1 C14.91,1 14.74,1.25 14.6,1.5 C14.6,1.5 9.01,11.42 8.82,11.74 C8.83,11.76 12.51,18.51 12.51,18.51 C12.64,18.74 12.84,19 13.23,19 L15.82,19 C15.98,19 16.1,18.94 16.16,18.83 C16.23,18.72 16.23,18.57 16.16,18.43 L12.5,11.74 L12.5,11.72 L18.25,1.56 C18.32,1.42 18.32,1.27 18.25,1.16 C18.21,1.06 18.08,1 17.93,1 L15.3,1 L15.3,1 Z\" /></svg>",
+        "yelp": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M17.175,14.971c-0.112,0.77-1.686,2.767-2.406,3.054c-0.246,0.1-0.487,0.076-0.675-0.069\tc-0.122-0.096-2.446-3.859-2.446-3.859c-0.194-0.293-0.157-0.682,0.083-0.978c0.234-0.284,0.581-0.393,0.881-0.276\tc0.016,0.01,4.21,1.394,4.332,1.482c0.178,0.148,0.263,0.379,0.225,0.646L17.175,14.971L17.175,14.971z M11.464,10.789\tc-0.203-0.307-0.199-0.666,0.009-0.916c0,0,2.625-3.574,2.745-3.657c0.203-0.135,0.452-0.141,0.69-0.025\tc0.691,0.335,2.085,2.405,2.167,3.199v0.027c0.024,0.271-0.082,0.491-0.273,0.623c-0.132,0.083-4.43,1.155-4.43,1.155\tc-0.322,0.096-0.68-0.06-0.882-0.381L11.464,10.789z M9.475,9.563C9.32,9.609,8.848,9.757,8.269,8.817c0,0-3.916-6.16-4.007-6.351\tc-0.057-0.212,0.011-0.455,0.202-0.65C5.047,1.211,8.21,0.327,9.037,0.529c0.27,0.069,0.457,0.238,0.522,0.479\tc0.047,0.266,0.433,5.982,0.488,7.264C10.098,9.368,9.629,9.517,9.475,9.563z M9.927,19.066c-0.083,0.225-0.273,0.373-0.54,0.421\tc-0.762,0.13-3.15-0.751-3.647-1.342c-0.096-0.131-0.155-0.262-0.167-0.394c-0.011-0.095,0-0.189,0.036-0.272\tc0.061-0.155,2.917-3.538,2.917-3.538c0.214-0.272,0.595-0.355,0.952-0.213c0.345,0.13,0.56,0.428,0.536,0.749\tC10.014,14.479,9.977,18.923,9.927,19.066z M3.495,13.912c-0.235-0.009-0.444-0.148-0.568-0.382c-0.089-0.17-0.151-0.453-0.19-0.794\tC2.63,11.701,2.761,10.144,3.07,9.648c0.145-0.226,0.357-0.345,0.592-0.336c0.154,0,4.255,1.667,4.255,1.667\tc0.321,0.118,0.521,0.453,0.5,0.833c-0.023,0.37-0.236,0.655-0.551,0.738L3.495,13.912z\" /></svg>",
+        "youtube": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M15,4.1c1,0.1,2.3,0,3,0.8c0.8,0.8,0.9,2.1,0.9,3.1C19,9.2,19,10.9,19,12c-0.1,1.1,0,2.4-0.5,3.4c-0.5,1.1-1.4,1.5-2.5,1.6 c-1.2,0.1-8.6,0.1-11,0c-1.1-0.1-2.4-0.1-3.2-1c-0.7-0.8-0.7-2-0.8-3C1,11.8,1,10.1,1,8.9c0-1.1,0-2.4,0.5-3.4C2,4.5,3,4.3,4.1,4.2 C5.3,4.1,12.6,4,15,4.1z M8,7.5v6l5.5-3L8,7.5z\" /></svg>"
+    });
 
-    if (plugin.installed) {
-        return;
     }
 
-    UIkit.icon.add(Icons);
+    if (typeof window !== 'undefined' && window.UIkit) {
+        window.UIkit.use(plugin);
+    }
 
-}
+    return plugin;
-
-if (typeof window !== 'undefined' && window.UIkit) {
-    window.UIkit.use(plugin);
-}
-
-return plugin;
 
 })));

admin/custom/wiki_menu.txt

@@ -0,0 +1 @@
+[EXTERNALCODE=https://raw.githubusercontent.com/wiki/vdm-io/Joomla-Component-Builder/1.---Home.md]

admin/helpers/compiler.php

@@ -95,10 +95,12 @@ class Compiler extends Infusion
 			{
 				if (ComponentbuilderHelper::checkArray($this->langNot))
 				{
+					$this->app->enqueueMessage(JText::_('<hr /><h3>Language Warning</h3>'), 'Warning');
 					foreach ($this->langNot as $tag => $percentage)
 					{
 						$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> language has %s&#37; translated, you will need to translate %s&#37; of the language strings before it will be added.', $tag, $percentage, $this->percentageLanguageAdd), 'Warning');
 					}
+					$this->app->enqueueMessage(JText::_('<hr /><h3>Language Notice</h3>'), 'Notice');
 					$this->app->enqueueMessage(JText::sprintf('<b>You can change this percentage of translated strings required in the global options of JCB.</b><br />Please watch this <a href=%s>tutorial for more help surrounding the JCB translations manager</a>.', '"https://youtu.be/zzAcVkn_cWU?list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE" target="_blank" title="JCB Tutorial surrounding Translation Manager"'), 'Notice');
 				}
 				// set why the strings were added
@@ -110,6 +112,7 @@ class Compiler extends Infusion
 				// show languages that were added
 				if (ComponentbuilderHelper::checkArray($this->langSet))
 				{
+					$this->app->enqueueMessage(JText::_('<hr /><h3>Language Notice</h3>'), 'Notice');
 					foreach ($this->langSet as $tag => $percentage)
 					{
 						$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> language has %s&#37; translated. Was addeded %s', $tag, $percentage, $whyAddedLang), 'Notice');
@@ -142,6 +145,7 @@ class Compiler extends Infusion
 				// set a notice if we have a mismatch
 				if (isset($mismatch) && ComponentbuilderHelper::checkArray($mismatch))
 				{
+					$this->app->enqueueMessage(JText::_('<hr /><h3>Language Warning</h3>'), 'Warning');
 					if (count($mismatch) > 1)
 					{
 						$this->app->enqueueMessage(JText::_('<h3>Please check the following mismatching Joomla.JText language constants.</h3>'), 'Warning');
@@ -156,7 +160,6 @@ class Compiler extends Infusion
 						$constant = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($string, 'U');
 						$this->app->enqueueMessage(JText::sprintf('The <b>Joomla.JText._(&apos;%s&apos;)</b> language constant for <b>%s</b> does not have a corresponding <code>JText::script(&apos;%s&apos;)</code> decalaration, please add it.', $constant, $string, $string), 'Warning');
 					}
-					$this->app->enqueueMessage('<hr />', 'Warning');
 				}
 			}
 			// check if we should add a EXTERNALCODE notice
@@ -169,7 +172,6 @@ class Compiler extends Infusion
 				// the notice
 				$this->app->enqueueMessage(JText::_('<hr /><h3>External Code Notice</h3>'), 'Notice');
 				$this->app->enqueueMessage(JText::sprintf('There has been <b>%s - %s</b> added to this component as EXTERNALCODE. To avoid shipping your component with malicious %s always make sure that the correct <b>code/string values</b> were used.', $externalCount, $externalCodeString, $externalCodeString), 'Notice');
-				$this->app->enqueueMessage('<hr />', 'Notice');
 			}
 			// end the timer here
 			$this->time_end = microtime(true);
@@ -274,6 +276,11 @@ class Compiler extends Infusion
 		{
 			$answer = $this->setPlaceholders($answer, $this->fileContentDynamic[$view], 3);
 		}
+		// check if this file needs extra care :)
+		if (isset($this->updateFileContent[$path]))
+		{
+			$answer = $this->setDynamicValues($answer);
+		}
 		// add answer back to file
 		$this->writeFile($path, $answer);
 		// count the file lines
@@ -594,6 +601,7 @@ class Compiler extends Infusion
 						{
 							// Load escaped code since the target endhash has changed
 							$this->loadEscapedCode($file, $target, $lineBites);
+							$this->app->enqueueMessage(JText::_('<hr /><h3>Custom Code Warning</h3>'), 'Warning');
 							$this->app->enqueueMessage(JText::sprintf('Custom code could not be added to <b>%s</b> please review the file at <b>line %s</b>. This could be due to a change to lines below the custom code.', $target['path'], $target['from_line']), 'Warning');
 						}
 					}
@@ -601,12 +609,14 @@ class Compiler extends Infusion
 					{
 						// Load escaped code since the target hash has changed
 						$this->loadEscapedCode($file, $target, $lineBites);
+						$this->app->enqueueMessage(JText::_('<hr /><h3>Custom Code Warning</h3>'), 'Warning');
 						$this->app->enqueueMessage(JText::sprintf('Custom code could not be added to <b>%s</b> please review the file at <b>line %s</b>. This could be due to a change to lines above the custom code.', $target['path'], $target['from_line']), 'Warning');
 					}
 				}
 				else
 				{
 					// Give developer a notice that file is not found.
+					$this->app->enqueueMessage(JText::_('<hr /><h3>Custom Code Warning</h3>'), 'Warning');
 					$this->app->enqueueMessage(JText::sprintf('File <b>%s</b> could not be found, so the custom code for this file could not be addded.', $target['path']), 'Warning');
 				}
 			}

admin/helpers/compiler/a_Get.php

@@ -709,6 +709,24 @@ class Get
 	 */
 	public $tabSpacer = "\t";
 
+	/**
+	 * mysql table setting keys
+	 * 
+	 * @var    array
+	 */
+	public $mysqlTableKeys = array(
+		'engine' => array('default' => 'MyISAM'),
+		'charset' => array('default' => 'utf8'),
+		'collate' => array('default' => 'utf8_general_ci')
+		);
+
+	/**
+	 * mysql table settings
+	 * 
+	 * @var    array
+	 */
+	public $mysqlTableSetting = array();
+
 	/**
 	 * Constructor
 	 */
@@ -737,7 +755,8 @@ class Get
 				// we do not have the tidy extention set fall back to StringManipulation
 				$this->fieldBuilderType = 1;
 				// load the sugestion to use string manipulation
-				$this->app->enqueueMessage(JText::_('Since you do not have <b>Tidy</b> extentsion setup on your system, we could not use the SimpleXMLElement class. We instead used <b>string manipulation</b> to build all your fields, this is a faster method, you must inspect the xml files in your component package to see if you are satisfied with the result.<br />You can make this method your default by opening the global options of JCB and under the <b>Global</b> tab set the <b>Field Builder Type</b> to string manipulation.<hr />'), 'Notice');
+				$this->app->enqueueMessage(JText::_('<hr /><h3>Field Notice</h3>'), 'Notice');
+				$this->app->enqueueMessage(JText::_('Since you do not have <b>Tidy</b> extentsion setup on your system, we could not use the SimpleXMLElement class. We instead used <b>string manipulation</b> to build all your fields, this is a faster method, you must inspect the xml files in your component package to see if you are satisfied with the result.<br />You can make this method your default by opening the global options of JCB and under the <b>Global</b> tab set the <b>Field Builder Type</b> to string manipulation.'), 'Notice');
 			}
 			// load the compiler path
 			$this->compilerPath = $this->params->get('compiler_folder_path', JPATH_COMPONENT_ADMINISTRATOR . '/compiler');
@@ -1158,22 +1177,14 @@ class Get
 		$component->addconfig = (isset($component->addconfig) && ComponentbuilderHelper::checkJson($component->addconfig)) ? json_decode($component->addconfig, true) : null;
 		if (ComponentbuilderHelper::checkArray($component->addconfig))
 		{
-			$component->config = array_map(function($field)
+			$component->config = array_map(function($field) {
-			{
+				// make sure the alias and title is 0
-				// set hash 
-				static $hash = 1;
-				// load hash
-				$field['hash'] = md5($field['field'] . $hash);
-				// increment hash
-				$hash++;
 				$field['alias'] = 0;
 				$field['title'] = 0;
-				// load the settings
+				// set the field details
-				$field['settings'] = $this->getFieldData($field['field']);
+				$this->setFieldDetails($field);
-				// set real field name
+				// set unique name counter
-				$field['base_name'] = $this->getFieldName($field);
+				$this->setUniqueNameCounter($field['base_name'], 'configs');
-				// set unigue name keeper
-				$this->setUniqueNameCounter($this->getFieldName($field), 'configs');
 				// return field
 				return $field;
 			}, array_values($component->addconfig));
@@ -1650,23 +1661,8 @@ class Get
 				// load the field data
 				$view->fields = array_map(function($field) use($name_single, $name_list, &$ignoreFields)
 				{
-					// set hash 
+					// set the field details
-					static $hash = 123467890; // (TODO) I found this making duplicates
+					$this->setFieldDetails($field, $name_single, $name_list);
-					// load hash
-					$field['hash'] = md5($field['field'] . $hash);
-					// increment hash
-					$hash++;
-					// set the settings
-					$field['settings'] = $this->getFieldData($field['field'], $name_single, $name_list);
-					// set real field name
-					$field['base_name'] = $this->getFieldName($field);
-					// set code name for field type
-					$field['type_name'] = $this->getFieldType($field);
-					// check if value is array
-					if (isset($field['permission']) && !ComponentbuilderHelper::checkArray($field['permission']) && is_numeric($field['permission']) && $field['permission'] > 0)
-					{
-						$field['permission'] = array($field['permission']);
-					}
 					// check if this field is a default field OR
 					// check if this is none database related field
 					if (in_array($field['base_name'], $this->defaultFields) ||
@@ -1675,8 +1671,6 @@ class Get
 					{
 						$ignoreFields[$field['field']] = $field['field'];
 					}
-					// set unigue name keeper
-					$this->setUniqueNameCounter($field['base_name'], $name_list);
 					// return field
 					return $field;
 				}, array_values($view->addfields));
@@ -1759,6 +1753,7 @@ class Get
 								elseif ($old_field_name !== $field_name)
 								{
 									// give a notice atleast that the multi fields could have changed and no DB update was done
+									$this->app->enqueueMessage(JText::_('<hr /><h3>Field Notice</h3>'), 'Notice');
 									$this->app->enqueueMessage(JText::sprintf('You have a field called <b>%s</b> that has been added multiple times to the <b>%s</b> view, the name of that field has changed to <b>%s</b>. Normaly we would automaticly add the update SQL to your component, but with multiple fields this does not work automaticly since it could be that noting changed and it just seems like it did. Therefore you will have to do this manualy if it actualy did change!', $field_name, $name_single, $old_field_name), 'Notice');
 								}
 								// remove tmp
@@ -1777,6 +1772,20 @@ class Get
 				{
 					$this->setUpdateSQL(ComponentbuilderHelper::safeString($old_view->name_single), $name_single, 'table_name', $name_single);
 				}
+				// loop the mysql table settings
+				foreach ($this->mysqlTableKeys as $_mysqlTableKey => $_mysqlTableVal)
+				{
+					// check if the table engine changed
+					if (isset($old_view->{'mysql_table_' . $_mysqlTableKey}) && isset($view->{'mysql_table_' . $_mysqlTableKey}))
+					{
+						$this->setUpdateSQL( $old_view->{'mysql_table_' . $_mysqlTableKey}, $view->{'mysql_table_' . $_mysqlTableKey}, 'table_' . $_mysqlTableKey, $name_single);
+					}
+					// check if there is no history on table engine, and it changed from the default/global
+					elseif (isset($view->{'mysql_table_' . $_mysqlTableKey}) && ComponentbuilderHelper::checkString($view->{'mysql_table_' . $_mysqlTableKey}) && !is_numeric($view->{'mysql_table_' . $_mysqlTableKey}))
+					{
+						$this->setUpdateSQL($_mysqlTableVal['default'], $view->{'mysql_table_' . $_mysqlTableKey}, 'table_' . $_mysqlTableKey, $name_single);
+					}
+				}
 				// clear this data
 				unset($old_view);
 			}
@@ -2095,6 +2104,25 @@ class Get
 					unset($view->sql);
 				}
 			}
+			// load table settings
+			if (!isset($this->mysqlTableSetting[$name_single]))
+			{
+				$this->mysqlTableSetting[$name_single] = array();
+			}
+			// set mySql Table Settings
+			foreach ($this->mysqlTableKeys as $_mysqlTableKey => $_mysqlTableVal)
+			{
+				if (isset($view->{'mysql_table_' . $_mysqlTableKey}) && ComponentbuilderHelper::checkString($view->{'mysql_table_' . $_mysqlTableKey}) && !is_numeric($view->{'mysql_table_' . $_mysqlTableKey}))
+				{
+					$this->mysqlTableSetting[$name_single][$_mysqlTableKey] = $view->{'mysql_table_' . $_mysqlTableKey};
+				}
+				else
+				{
+					$this->mysqlTableSetting[$name_single][$_mysqlTableKey] = $_mysqlTableVal['default'];
+				}
+				// remove the table values since we moved to another object
+				unset($view->{'mysql_table_' . $_mysqlTableKey});
+			}
 			// clear placeholders
 			unset($this->placeholders[$this->hhh . 'view' . $this->hhh]);
 			unset($this->placeholders[$this->hhh . 'views' . $this->hhh]);
@@ -2620,6 +2648,55 @@ class Get
 		return false;
 	}
 
+	/**
+	 * set Field details
+	 * 
+	 * @param   object   $field           The field object
+	 * @param   string   $singleViewName  The single view name
+	 * @param   string   $listViewName    The list view name
+	 * @param   string   $amicably        The peaceful resolve
+	 * 
+	 * @return  void
+	 * 
+	 */
+	public function setFieldDetails(&$field, $singleViewName = null, $listViewName = null, $amicably = '')
+	{
+		// set hash
+		static $hash = 123467890;
+		// load hash if not found
+		if (!isset($field['hash']))
+		{
+			$field['hash'] = md5($field['field'] . $hash);
+			// increment hash
+			$hash++;
+		}
+		// set the settings
+		if (!isset($field['settings']))
+		{
+			$field['settings'] = $this->getFieldData($field['field'], $singleViewName, $listViewName);
+		}
+		// set real field name
+		if (!isset($field['base_name']))
+		{
+			$field['base_name'] = $this->getFieldName($field);
+		}
+		// set code name for field type
+		if (!isset($field['type_name']))
+		{
+			$field['type_name'] = $this->getFieldType($field);
+		}
+		// check if value is array
+		if (isset($field['permission']) && !ComponentbuilderHelper::checkArray($field['permission']) && is_numeric($field['permission']) && $field['permission'] > 0)
+		{
+			$field['permission'] = array($field['permission']);
+		}
+		// set unigue name keeper
+		if ($listViewName)
+		{
+			$this->setUniqueNameCounter($field['base_name'], $listViewName . $amicably);
+		}
+	}
+
 	/**
 	 * Get the field's actual type
 	 * 
@@ -2635,46 +2712,56 @@ class Get
 		{
 			return $field['type_name'];
 		}
-		// set the type name
-		$type_name = ComponentbuilderHelper::safeString($field['settings']->type_name);
 		// check that we have the poperties
 		if (ComponentbuilderHelper::checkArray($field['settings']->properties))
 		{
-			foreach ($field['settings']->properties as $property)
+			// search for own custom fields
+			if (strpos($field['settings']->type_name, '@') !== false)
 			{
-				if ($property['name'] === 'type')
+				// set own custom field
+				$field['settings']->own_custom = $field['settings']->type_name;
+				$field['settings']->type_name = 'Custom';
+			}
+			// set the type name
+			$type_name = ComponentbuilderHelper::safeString($field['settings']->type_name);
+			// if custom (we must use the xml value)
+			if ($type_name === 'custom' || $type_name === 'customuser')
+			{
+				$type = ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($field['settings']->xml, 'type="', '"'));
+			}
+			else
+			{
+				// loop over properties looking for the type value
+				foreach ($field['settings']->properties as $property)
 				{
-					// if custom (we must use the xml value)
+					if ($property['name'] === 'type') // type field is never ajustable (unless custom)
-					if ($type_name === 'custom' || $type_name === 'customuser')
 					{
-						$type = ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($field['settings']->xml, 'type="', '"'));
+						// force the default value
+						if (isset($property['example']) && ComponentbuilderHelper::checkString($property['example']))
+						{
+							$type = ComponentbuilderHelper::safeString($property['example']);
+						}
+						// fallback on type name set in name field
+						elseif (ComponentbuilderHelper::checkString($type_name))
+						{
+							$type = $type_name;
+						}
+						// fall back on the xml settings (not ideal)
+						else
+						{
+							$type = ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($xml, 'type="', '"'));
+						}
+						// exit foreach loop
+						break;
 					}
-					// use field core type (name)
-					elseif (ComponentbuilderHelper::checkString($type_name) || (isset($property['example']) && ComponentbuilderHelper::checkString($property['example']) && $property['adjustable'] == 0))
-					{
-						$type = $type_name;
-					}
-					// make sure none adjustable fields are set (should be same as above) (TODO) hmmm we need look at this again
-					elseif (isset($property['example']) && ComponentbuilderHelper::checkString($property['example']) && $property['adjustable'] == 0)
-					{
-						$type = $property['example'];
-					}
-					// fall back on the xml settings (not ideal)
-					else
-					{
-						$type = ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($xml, 'type="', '"'));
-					}
-
-					// check if the value is set
-					if (ComponentbuilderHelper::checkString($type))
-					{
-						// add the value
-						return $type;
-					}
-					// exit foreach loop
-					break;
 				}
 			}
+			// check if the value is set
+			if (ComponentbuilderHelper::checkString($type))
+			{
+				// add the value
+				return $type;
+			}
 		}
 		// fall back to text
 		return 'text';
@@ -2685,16 +2772,17 @@ class Get
 	 * 
 	 * @param   object   $field         The field object
 	 * @param   string   $listViewName  The list view name
+	 * @param   string   $amicably      The peaceful resolve
 	 * 
 	 * @return  string   Success returns field name
 	 * 
 	 */
-	public function getFieldName(&$field, $listViewName = null)
+	public function getFieldName(&$field, $listViewName = null, $amicably = '')
 	{
 		// return the unique name if already set
-		if (ComponentbuilderHelper::checkString($listViewName) && isset($field['hash']) && isset($this->uniqueFieldNames[$listViewName . $field['hash']]))
+		if (ComponentbuilderHelper::checkString($listViewName) && isset($field['hash']) && isset($this->uniqueFieldNames[$listViewName . $amicably . $field['hash']]))
 		{
-			return $this->uniqueFieldNames[$listViewName . $field['hash']];
+			return $this->uniqueFieldNames[$listViewName . $amicably . $field['hash']];
 		}
 		// always make sure we have a field name and type
 		if (!isset($field['settings']) || !isset($field['settings']->type_name) || !isset($field['settings']->name))
@@ -2771,9 +2859,9 @@ class Get
 		// return the value unique
 		if (ComponentbuilderHelper::checkString($listViewName) && isset($field['hash']))
 		{
-			$this->uniqueFieldNames[$listViewName . $field['hash']] = $this->uniqueName($name, $listViewName);
+			$this->uniqueFieldNames[$listViewName . $amicably . $field['hash']] = $this->uniqueName($name, $listViewName . $amicably);
 			// now return the unique name
-			return $this->uniqueFieldNames[$listViewName . $field['hash']];
+			return $this->uniqueFieldNames[$listViewName . $amicably . $field['hash']];
 		}
 		// fall back to global
 		return $name;
@@ -2912,6 +3000,8 @@ class Get
 						// reset buckets
 						$result->main_get = array();
 						$result->custom_get = array();
+						// should joineds and other weaks be added
+						$addDynamicTweaksJoints = true;
 						// set source data
 						switch ($result->main_source)
 						{
@@ -2956,149 +3046,165 @@ class Get
 								$result->main_get[0]['as'] = 'a';
 								$result->main_get[0]['key'] = $result->key;
 								$result->main_get[0]['context'] = $context;
+								// do not add
+								$addDynamicTweaksJoints = false;
 								break;
 						}
-						// set join_view_table details
+						// only add if main source is not custom
-						$result->join_view_table = json_decode($result->join_view_table, true);
+						if ($addDynamicTweaksJoints)
-						if (ComponentbuilderHelper::checkArray($result->join_view_table))
 						{
-							foreach ($result->join_view_table as $nr => &$option)
+							// set join_view_table details
+							$result->join_view_table = json_decode($result->join_view_table, true);
+							if (ComponentbuilderHelper::checkArray($result->join_view_table))
 							{
-								if (ComponentbuilderHelper::checkString($option['selection']))
+								foreach ($result->join_view_table as $nr => &$option)
 								{
-									// convert the type
+									if (ComponentbuilderHelper::checkString($option['selection']))
-									$option['type'] = $typeArray[$option['type']];
-									// convert the operator
-									$option['operator'] = $operatorArray[$option['operator']];
-									// get the on field values
-									$on_field = array(); // array(on_field_as, on_field)
-									$on_field = array_map('trim', explode('.', $option['on_field']));
-									// get the join field values
-									$join_field = array(); // array(join_field_as, join_field) 
-									$join_field = array_map('trim', explode('.', $option['join_field']));
-									$option['selection'] = $this->setDataSelection($result->key, $view_code, $option['selection'], $option['view_table'], $option['as'], $option['row_type'], 'view');
-									$option['key'] = $result->key;
-									$option['context'] = $context;
-									// load to the getters
-									if ($option['row_type'] == 1)
 									{
-										$result->main_get[] = $option;
+										// convert the type
-										if ($on_field[0] === 'a')
+										$option['type'] = $typeArray[$option['type']];
+										// convert the operator
+										$option['operator'] = $operatorArray[$option['operator']];
+										// get the on field values
+										$on_field = array(); // array(on_field_as, on_field)
+										$on_field = array_map('trim', explode('.', $option['on_field']));
+										// get the join field values
+										$join_field = array(); // array(join_field_as, join_field) 
+										$join_field = array_map('trim', explode('.', $option['join_field']));
+										$option['selection'] = $this->setDataSelection($result->key, $view_code, $option['selection'], $option['view_table'], $option['as'], $option['row_type'], 'view');
+										$option['key'] = $result->key;
+										$option['context'] = $context;
+										// load to the getters
+										if ($option['row_type'] == 1)
 										{
-											$this->siteMainGet[$this->target][$view_code][$option['as']] = $option['as'];
+											$result->main_get[] = $option;
+											if ($on_field[0] === 'a')
+											{
+												$this->siteMainGet[$this->target][$view_code][$option['as']] = $option['as'];
+											}
+											else
+											{
+												$this->siteDynamicGet[$this->target][$view_code][$option['as']][$join_field[1]] = $on_field[0];
+											}
 										}
-										else
+										elseif ($option['row_type'] == 2)
 										{
-											$this->siteDynamicGet[$this->target][$view_code][$option['as']][$join_field[1]] = $on_field[0];
+											$result->custom_get[] = $option;
+											if ($on_field[0] != 'a')
+											{
+												$this->siteDynamicGet[$this->target][$view_code][$option['as']][$join_field[1]] = $on_field[0];
+											}
 										}
 									}
-									elseif ($option['row_type'] == 2)
+									unset($result->join_view_table[$nr]);
-									{
-										$result->custom_get[] = $option;
-										if ($on_field[0] != 'a')
-										{
-											$this->siteDynamicGet[$this->target][$view_code][$option['as']][$join_field[1]] = $on_field[0];
-										}
-									}
-								}
-								unset($result->join_view_table[$nr]);
-							}
-						}
-						unset($result->join_view_table);
-						// set join_db_table details
-						$result->join_db_table = json_decode($result->join_db_table, true);
-						if (ComponentbuilderHelper::checkArray($result->join_db_table))
-						{
-							foreach ($result->join_db_table as $nr => &$option1)
-							{
-								if (ComponentbuilderHelper::checkString($option1['selection']))
-								{
-									// convert the type
-									$option1['type'] = $typeArray[$option1['type']];
-									// convert the operator
-									$option1['operator'] = $operatorArray[$option1['operator']];
-									// get the on field values
-									$on_field = array(); // array(on_field_as, on_field)
-									$on_field = array_map('trim', explode('.', $option1['on_field']));
-									// get the join field values
-									$join_field = array(); // array(join_field_as, join_field) 
-									$join_field = array_map('trim', explode('.', $option1['join_field']));
-									$option1['selection'] = $this->setDataSelection($result->key, $view_code, $option1['selection'], $option1['db_table'], $option1['as'], $option1['row_type'], 'db');
-									$option1['key'] = $result->key;
-									$option1['context'] = $context;
-									// load to the getters
-									if ($option1['row_type'] == 1)
-									{
-										$result->main_get[] = $option1;
-										if ($on_field[0] === 'a')
-										{
-											$this->siteMainGet[$this->target][$view_code][$option1['as']] = $option1['as'];
-										}
-										else
-										{
-											$this->siteDynamicGet[$this->target][$view_code][$option1['as']][$join_field[1]] = $on_field[0];
-										}
-									}
-									elseif ($option1['row_type'] == 2)
-									{
-										$result->custom_get[] = $option1;
-										if ($on_field[0] != 'a')
-										{
-											$this->siteDynamicGet[$this->target][$view_code][$option1['as']][$join_field[1]] = $on_field[0];
-										}
-									}
-								}
-								unset($result->join_db_table[$nr]);
-							}
-						}
-						unset($result->join_db_table);
-						// set filter details
-						$result->filter = json_decode($result->filter, true);
-						if (ComponentbuilderHelper::checkArray($result->filter))
-						{
-							foreach ($result->filter as $nr => &$option2)
-							{
-								if (isset($option2['operator']))
-								{
-									$option2['operator'] = $operatorArray[$option2['operator']];
-									$option2['key'] = $result->key;
-								}
-								else
-								{
-									unset($result->filter[$nr]);
 								}
 							}
-						}
+							unset($result->join_view_table);
-						// set where details
+							// set join_db_table details
-						$result->where = json_decode($result->where, true);
+							$result->join_db_table = json_decode($result->join_db_table, true);
-						if (ComponentbuilderHelper::checkArray($result->where))
+							if (ComponentbuilderHelper::checkArray($result->join_db_table))
-						{
-							foreach ($result->where as $nr => &$option3)
 							{
-								if (isset($option3['operator']))
+								foreach ($result->join_db_table as $nr => &$option1)
 								{
-									$option3['operator'] = $operatorArray[$option3['operator']];
+									if (ComponentbuilderHelper::checkString($option1['selection']))
+									{
+										// convert the type
+										$option1['type'] = $typeArray[$option1['type']];
+										// convert the operator
+										$option1['operator'] = $operatorArray[$option1['operator']];
+										// get the on field values
+										$on_field = array(); // array(on_field_as, on_field)
+										$on_field = array_map('trim', explode('.', $option1['on_field']));
+										// get the join field values
+										$join_field = array(); // array(join_field_as, join_field) 
+										$join_field = array_map('trim', explode('.', $option1['join_field']));
+										$option1['selection'] = $this->setDataSelection($result->key, $view_code, $option1['selection'], $option1['db_table'], $option1['as'], $option1['row_type'], 'db');
+										$option1['key'] = $result->key;
+										$option1['context'] = $context;
+										// load to the getters
+										if ($option1['row_type'] == 1)
+										{
+											$result->main_get[] = $option1;
+											if ($on_field[0] === 'a')
+											{
+												$this->siteMainGet[$this->target][$view_code][$option1['as']] = $option1['as'];
+											}
+											else
+											{
+												$this->siteDynamicGet[$this->target][$view_code][$option1['as']][$join_field[1]] = $on_field[0];
+											}
+										}
+										elseif ($option1['row_type'] == 2)
+										{
+											$result->custom_get[] = $option1;
+											if ($on_field[0] != 'a')
+											{
+												$this->siteDynamicGet[$this->target][$view_code][$option1['as']][$join_field[1]] = $on_field[0];
+											}
+										}
+									}
+									unset($result->join_db_table[$nr]);
 								}
-								else
+							}
+							unset($result->join_db_table);
+							// set filter details
+							$result->filter = json_decode($result->filter, true);
+							if (ComponentbuilderHelper::checkArray($result->filter))
+							{
+								foreach ($result->filter as $nr => &$option2)
 								{
-									unset($result->where[$nr]);
+									if (isset($option2['operator']))
+									{
+										$option2['operator'] = $operatorArray[$option2['operator']];
+										$option2['key'] = $result->key;
+									}
+									else
+									{
+										unset($result->filter[$nr]);
+									}
 								}
 							}
+							// set where details
+							$result->where = json_decode($result->where, true);
+							if (ComponentbuilderHelper::checkArray($result->where))
+							{
+								foreach ($result->where as $nr => &$option3)
+								{
+									if (isset($option3['operator']))
+									{
+										$option3['operator'] = $operatorArray[$option3['operator']];
+									}
+									else
+									{
+										unset($result->where[$nr]);
+									}
+								}
+							}
+							else
+							{
+								unset($result->where);
+							}
+							// set order details
+							$result->order = json_decode($result->order, true);
+							if (!ComponentbuilderHelper::checkArray($result->order))
+							{
+								unset($result->order);
+							}
+							// set global details
+							$result->global = json_decode($result->global, true);
+							if (!ComponentbuilderHelper::checkArray($result->global))
+							{
+								unset($result->global);
+							}
 						}
 						else
 						{
+							// when we have a custom query script we do not add the dynamic options
+							unset($result->join_view_table);
+							unset($result->join_db_table);
+							unset($result->filter);
 							unset($result->where);
-						}
-						// set order details
-						$result->order = json_decode($result->order, true);
-						if (!ComponentbuilderHelper::checkArray($result->order))
-						{
 							unset($result->order);
-						}
-						// set global details
-						$result->global = json_decode($result->global, true);
-						if (!ComponentbuilderHelper::checkArray($result->global))
-						{
 							unset($result->global);
 						}
 						// load the events if any is set
@@ -3320,7 +3426,7 @@ class Get
 				}
 			}
 		}
-		elseif ($key && ComponentbuilderHelper::checkString($new) && ComponentbuilderHelper::checkString($old) && $new !== $old)
+		elseif ($key && ((ComponentbuilderHelper::checkString($new) && ComponentbuilderHelper::checkString($old)) || (is_numeric($new) && is_numeric($old))) && $new !== $old)
 		{
 			// the string changed, lets add to SQL update
 			if (!isset($this->updateSQL[$type]) || !ComponentbuilderHelper::checkArray($this->updateSQL[$type]))
@@ -4550,7 +4656,6 @@ class Get
 							// set the notice
 							$this->app->enqueueMessage(JText::_('<hr /><h3>External Code Warning</h3>'), 'Warning');
 							$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> is not a valid url/path!', $key), 'Warning');
-							$this->app->enqueueMessage('<hr />', 'Warning');
 							// remove the placeholder
 							$bucket[$key] = '';
 						}
@@ -4560,7 +4665,8 @@ class Get
 						// set key
 						$key = '[EXTERNA' . 'LCODE=' . $target . ']';
 						// set the notice
-						$this->app->enqueueMessage(JText::sprintf('%s, you do not have permission to use <b>EXTERNALCODE</b> feature (so it was removed from the compilation), please contact you system administrator for more info!<br /><small>(admin access required)</small>', $this->user->get('name')), 'Error');
+						$this->app->enqueueMessage(JText::_('<hr /><h3>External Code Error</h3>'), 'Error');
+						$this->app->enqueueMessage(JText::sprintf('%s, you do not have permission to use <b>EXTERNALCODE</b> feature (so <b>%s</b> was removed from the compilation), please contact you system administrator for more info!<br /><small>(admin access required)</small>', $this->user->get('name'), $key), 'Error');
 						// remove the placeholder
 						$bucket[$key] = '';
 					}
@@ -4620,7 +4726,6 @@ class Get
 						// give notice of the change
 						$this->app->enqueueMessage(JText::_('<hr /><h3>External Code Warning</h3>'), 'Warning');
 						$this->app->enqueueMessage(JText::sprintf('The code/string from <b>%s</b> has been <b>changed</b> since the last compilation, please investigate to insure the changes are safe!', $key), 'Warning');
-						$this->app->enqueueMessage('<hr />', 'Warning');
 					}
 				}
 				else
@@ -4634,7 +4739,6 @@ class Get
 					// give notice the first time this is added
 					$this->app->enqueueMessage(JText::_('<hr /><h3>External Code Notice</h3>'), 'Notice');
 					$this->app->enqueueMessage(JText::sprintf('The code/string from <b>%s</b> has been added for the <b>first time</b>, please investigate to insure the correct code/string was used!', $key), 'Notice');
-					$this->app->enqueueMessage('<hr />', 'Notice');
 				}
 			}
 			else
@@ -4642,7 +4746,6 @@ class Get
 				// set notice that we could not get a valid string from the target
 				$this->app->enqueueMessage(JText::_('<hr /><h3>External Code Warning</h3>'), 'Warning');
 				$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> returned an invalid string!', $key), 'Warning');
-				$this->app->enqueueMessage('<hr />', 'Warning');
 			}
 		}
 		// add to local bucket
@@ -5679,6 +5782,7 @@ class Get
 						{
 							// reset found comment type
 							$commentType = 0;
+							$this->app->enqueueMessage(JText::_('<hr /><h3>Custom Codes Warning</h3>'), 'Warning');
 							$this->app->enqueueMessage(JText::sprintf('We found dynamic code <b>all in one line</b>, and ignored it! Please review (%s) for more details!', $path), 'Warning');
 							continue;
 						}

admin/helpers/compiler/b_Structure.php

@@ -235,6 +235,13 @@ class Structure extends Get
 	 */
 	public $fileContentStatic = array();
 
+	/**
+	 * The standard folders
+	 * 
+	 * @var      array
+	 */
+	public $stdFolders = array('site', 'admin', 'media');
+
 	/**
 	 * Dynamic File Content
 	 * 
@@ -277,6 +284,13 @@ class Structure extends Get
 	 */
 	public $notNew = array();
 
+	/**
+	 * Update the file content
+	 * 
+	 * @var      array
+	 */
+	public $updateFileContent = array();
+
 	/**
 	 * The new files
 	 * 
@@ -320,6 +334,18 @@ class Structure extends Get
 		// first we run the perent constructor
 		if (parent::__construct($config))
 		{
+			// set incase no extra admin folder are loaded
+			$this->fileContentStatic[$this->hhh . 'EXSTRA_ADMIN_FOLDERS' . $this->hhh] = '';
+			// set incase no extra site folder are loaded
+			$this->fileContentStatic[$this->hhh . 'EXSTRA_SITE_FOLDERS' . $this->hhh] = '';
+			// set incase no extra media folder are loaded
+			$this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh] = '';
+			// set incase no extra admin files are loaded
+			$this->fileContentStatic[$this->hhh . 'EXSTRA_ADMIN_FILES' . $this->hhh] = '';
+			// set incase no extra site files are loaded
+			$this->fileContentStatic[$this->hhh . 'EXSTRA_SITE_FILES' . $this->hhh] = '';
+			// set incase no extra media files are loaded
+			$this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FILES' . $this->hhh] = '';
 			// run global updater
 			ComponentbuilderHelper::runGlobalUpdater();
 			// set the Joomla version
@@ -489,11 +515,7 @@ class Structure extends Get
 						// only add if local
 						if ($addLocalFolder)
 						{
-							// check if we sould add it to the media xml list
+							// add folder to ml of media folders
-							if (!isset($this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh]))
-							{
-								$this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh] = '';
-							}
 							$this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh] .= PHP_EOL . $this->_t(2) . "<folder>" . $libFolder . "</folder>";
 						}
 					}
@@ -571,24 +593,28 @@ class Structure extends Get
 						else
 						{
 							// set massage that something is wrong
+							$this->app->enqueueMessage(JText::_('<hr /><h3>Dashboard Error</h3>'), 'Error');
 							$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> (<b>%s</b>) is not available in your component! Please insure to only used %s, for a dynamic dashboard, that are still linked to your component.', $names[$t], $this->componentData->dashboard, $type_names), 'Error');
 						}
 					}
 					else
 					{
 						// set massage that something is wrong
+						$this->app->enqueueMessage(JText::_('<hr /><h3>Dashboard Error</h3>'), 'Error');
 						$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> (<b>%s</b>) is not available in your component! Please insure to only used %s, for a dynamic dashboard, that are still linked to your component.', $names[$t], $this->componentData->dashboard, $type_names), 'Error');
 					}
 				}
 				else
 				{
 					// the target value is wrong
+					$this->app->enqueueMessage(JText::_('<hr /><h3>Dashboard Error</h3>'), 'Error');
 					$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> value for the dynamic dashboard is invalid.', $this->componentData->dashboard), 'Error');
 				}
 			}
 			else
 			{
 				// the target value is wrong
+				$this->app->enqueueMessage(JText::_('<hr /><h3>Dashboard Error</h3>'), 'Error');
 				$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> value for the dynamic dashboard is invalid.', $this->componentData->dashboard), 'Error');
 			}
 			// if default was changed to dynamic dashboard the remove default tab and methods
@@ -767,8 +793,6 @@ class Structure extends Get
 			{
 				$README = true;
 			}
-			// set the standard folders
-			$stdFolders = array('site', 'admin', 'media');
 			// start moving
 			foreach ($this->joomlaVersionData->move->static as $ftem => $details)
 			{
@@ -814,6 +838,7 @@ class Structure extends Get
 				{
 					if (!JFile::exists($currentFullPath))
 					{
+						$this->app->enqueueMessage(JText::_('<hr /><h3>File Path Error</h3>'), 'Error');
 						$this->app->enqueueMessage(JText::sprintf('The file path: <b>%s</b> does not exist, and was not added!', $currentFullPath), 'Error');
 					}
 					else
@@ -834,12 +859,21 @@ class Structure extends Get
 						{
 							$this->newFiles['static'][] = array('path' => $packageFullPath, 'name' => $new, 'zip' => $zipFullPath);
 						}
+						// ensure we update this file if needed
+						if (isset($this->updateFileContent[$ftem]) && $this->updateFileContent[$ftem])
+						{
+							// remove the pointer
+							unset($this->updateFileContent[$ftem]);
+							// set the full path
+							$this->updateFileContent[$packageFullPath] = $packageFullPath;
+						}
 					}
 				}
 				elseif ($details->type === 'folder')
 				{
 					if (!JFolder::exists($currentFullPath))
 					{
+						$this->app->enqueueMessage(JText::_('<hr /><h3>Folder Path Error</h3>'), 'Error');
 						$this->app->enqueueMessage(JText::sprintf('The folder path: <b>%s</b> does not exist, and was not added!', $currentFullPath), 'Error');
 					}
 					else
@@ -851,19 +885,40 @@ class Structure extends Get
 					}
 				}
 				// check if we should add the dynamic folder moving script to the installer script
-				if (!$this->setMoveFolders)
+				$checker = array_values((array) explode('/', $zipFullPath));
+				// TODO <-- this may not be the best way, will keep an eye on this.
+				// We basicly only want to check if a folder is added that is not in the stdFolders array
+				if (isset($checker[0]) && ComponentbuilderHelper::checkString($checker[0]) && !in_array($checker[0], $this->stdFolders))
 				{
-					$checker = explode('/', $zipFullPath);
+					// check if we should add the dynamic folder moving script to the installer script
-					// TODO <-- this may not be the best way, will keep an eye on this.
+					if (!$this->setMoveFolders)
-					// We basicly only want to check if a folder is added that is not in the stdFolders array
-					if (isset($checker[0]) && ComponentbuilderHelper::checkString($checker[0]) && !in_array($checker[0], $stdFolders))
 					{
 						// add the setDynamicF0ld3rs() method to the install scipt.php file
 						$this->setMoveFolders = true;
 						// set message that this was done (will still add a tutorial link later)
-						$this->app->enqueueMessage(JText::sprintf('<p><b>Dynamic folder/s were detected.</b><br />A method (setDynamicF0ld3rs) was added to the install <b>script.php</b> of this package to insure that the folder/s are copied into the correct place when this componet is installed!</p>'), 'Notice');
+						$this->app->enqueueMessage(JText::_('<hr /><h3>Dynamic folder/s were detected.</h3>'), 'Notice');
+						$this->app->enqueueMessage(JText::sprintf('A method (setDynamicF0ld3rs) was added to the install <b>script.php</b> of this package to insure that the folder/s are copied into the correct place when this componet is installed!'), 'Notice');
 					}
 				}
+				elseif (count($checker) == 2 && ComponentbuilderHelper::checkString($checker[0]) && in_array($checker[0], $this->stdFolders))
+				{
+					// set the target
+					$eNAME = 'FILES';
+					$ename = 'filename';
+					if ($details->type === 'folder')
+					{
+						$eNAME = 'FOLDERS';
+						$ename = 'folder';
+					}
+					// set the tab
+					$eTab = $this->_t(2);
+					if ('admin' === $checker[0])
+					{
+						$eTab = $this->_t(3);
+					}
+					// set the xml file
+					$this->fileContentStatic[$this->hhh . 'EXSTRA_' . ComponentbuilderHelper::safeString($checker[0], 'U') . '_' . $eNAME . $this->hhh] .= PHP_EOL . $eTab . "<" . $ename . ">" . $checker[1] . "</" . $ename . ">";
+				}
 			}
 			return true;
 		}
@@ -1260,11 +1315,6 @@ class Structure extends Get
 					$custom['path'] = str_replace('/' . $lastFolder, '', $custom['path']);
 					$rename = 'new';
 					$newname = $lastFolder;
-					// add fix to insure it gets added to xml if needed
-					if (($tkey = array_search($lastFolder, $pathArray)) !== false)
-					{
-						unset($pathArray[$tkey]);
-					}
 				}
 				elseif ('full' === $customPath)
 				{
@@ -1273,11 +1323,6 @@ class Structure extends Get
 					$lastFolder = end($folderArray);
 					$rename = 'new';
 					$newname = $lastFolder;
-					// add fix to insure it gets added to xml if needed
-					if (($tkey = array_search($lastFolder, $pathArray)) !== false)
-					{
-						unset($pathArray[$tkey]);
-					}
 				}
 				else
 				{
@@ -1285,46 +1330,19 @@ class Structure extends Get
 					$rename = false;
 					$newname = '';
 				}
-				// check if we sould add it to the media xml list
+				// insure we have no duplicates
-				if (!isset($this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh]))
-				{
-					$this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh] = '';
-				}
-				if (count($pathArray) == 1 && $firstFolder === 'media')
-				{
-					$this->fileContentStatic[$this->hhh . 'EXSTRA_MEDIA_FOLDERS' . $this->hhh] .= PHP_EOL . $this->_t(2) . "<folder>" . $lastFolder . "</folder>";
-				}
-				// check if we sould add it to the site xml list
-				if (!isset($this->fileContentStatic[$this->hhh . 'EXSTRA_SITE_FOLDERS' . $this->hhh]))
-				{
-					$this->fileContentStatic[$this->hhh . 'EXSTRA_SITE_FOLDERS' . $this->hhh] = '';
-				}
-				if (count($pathArray) == 1 && $firstFolder === 'site')
-				{
-					$this->fileContentStatic[$this->hhh . 'EXSTRA_SITE_FOLDERS' . $this->hhh] .= PHP_EOL . $this->_t(2) . "<folder>" . $lastFolder . "</folder>";
-				}
-				// check if we sould add it to the admin xml list
-				if (!isset($this->fileContentStatic[$this->hhh . 'EXSTRA_ADMIN_FOLDERS' . $this->hhh]))
-				{
-					$this->fileContentStatic[$this->hhh . 'EXSTRA_ADMIN_FOLDERS' . $this->hhh] = '';
-				}
-				if (count($pathArray) == 1 && $firstFolder === 'admin')
-				{
-					$this->fileContentStatic[$this->hhh . 'EXSTRA_ADMIN_FOLDERS' . $this->hhh] .= PHP_EOL . $this->_t(3) . "<folder>" . $lastFolder . "</folder>";
-				}
-				// make we have not duplicates
 				$key_pointer = ComponentbuilderHelper::safeString($custom['folder']) . '_f' . $pointer_tracker;
 				$pointer_tracker++;
 				// fix custom path
 				$custom['path'] = ltrim($custom['path'], '/');
 				// set new folder to object
-				$versionData->move->static->$key_pointer = new stdClass();
+				$versionData->move->static->{$key_pointer} = new stdClass();
-				$versionData->move->static->$key_pointer->naam = str_replace('//','/', $custom['folder']);
+				$versionData->move->static->{$key_pointer}->naam = str_replace('//','/', $custom['folder']);
-				$versionData->move->static->$key_pointer->path = 'c0mp0n3nt/' . $custom['path'];
+				$versionData->move->static->{$key_pointer}->path = 'c0mp0n3nt/' . $custom['path'];
-				$versionData->move->static->$key_pointer->rename = $rename;
+				$versionData->move->static->{$key_pointer}->rename = $rename;
-				$versionData->move->static->$key_pointer->newName = $newname;
+				$versionData->move->static->{$key_pointer}->newName = $newname;
-				$versionData->move->static->$key_pointer->type = 'folder';
+				$versionData->move->static->{$key_pointer}->type = 'folder';
-				$versionData->move->static->$key_pointer->custom = $customPath;
+				$versionData->move->static->{$key_pointer}->custom = $customPath;
 			}
 			unset($this->componentData->folders);
 			unset($custom);
@@ -1367,8 +1385,8 @@ class Structure extends Get
 				$key_pointer = ComponentbuilderHelper::safeString($custom['file']) . '_g' . $pointer_tracker;
 				$pointer_tracker++;
 				// set new file to object
-				$versionData->move->static->$key_pointer = new stdClass();
+				$versionData->move->static->{$key_pointer} = new stdClass();
-				$versionData->move->static->$key_pointer->naam = str_replace('//','/',$custom['file']);
+				$versionData->move->static->{$key_pointer}->naam = str_replace('//','/',$custom['file']);
 				// update the dynamic component name placholders in file names
 				$custom['path'] = $this->setPlaceholders($custom['path'], $this->placeholders);
 				// get the path info
@@ -1377,36 +1395,41 @@ class Structure extends Get
 				{
 					$pathInfo['dirname'] = trim($pathInfo['dirname'], '/');
 					// set the info
-					$versionData->move->static->$key_pointer->path = 'c0mp0n3nt/' . $pathInfo['dirname'];
+					$versionData->move->static->{$key_pointer}->path = 'c0mp0n3nt/' . $pathInfo['dirname'];
-					$versionData->move->static->$key_pointer->rename = 'new';
+					$versionData->move->static->{$key_pointer}->rename = 'new';
-					$versionData->move->static->$key_pointer->newName = $pathInfo['basename'];
+					$versionData->move->static->{$key_pointer}->newName = $pathInfo['basename'];
 				}
 				elseif ('full' === $customPath)
 				{
 					// fix custom path
 					$custom['path'] = ltrim($custom['path'], '/');
 					// get file array
-					$fileArray = explode('/', $custom['file']);
+					$fileArray = (array) explode('/', $custom['file']);
 					// set the info
-					$versionData->move->static->$key_pointer->path = 'c0mp0n3nt/' . $custom['path'];
+					$versionData->move->static->{$key_pointer}->path = 'c0mp0n3nt/' . $custom['path'];
-					$versionData->move->static->$key_pointer->rename = 'new';
+					$versionData->move->static->{$key_pointer}->rename = 'new';
-					$versionData->move->static->$key_pointer->newName = end($fileArray);
+					$versionData->move->static->{$key_pointer}->newName = end($fileArray);
 				}
 				else
 				{
 					// fix custom path
 					$custom['path'] = ltrim($custom['path'], '/');
 					// set the info
-					$versionData->move->static->$key_pointer->path = 'c0mp0n3nt/' . $custom['path'];
+					$versionData->move->static->{$key_pointer}->path = 'c0mp0n3nt/' . $custom['path'];
-					$versionData->move->static->$key_pointer->rename = false;
+					$versionData->move->static->{$key_pointer}->rename = false;
 				}
+				$versionData->move->static->{$key_pointer}->type = 'file';
+				$versionData->move->static->{$key_pointer}->custom = $customPath;
 				// check if file should be updated
 				if (!isset($custom['notnew']) || $custom['notnew'] == 0 || $custom['notnew'] != 1)
 				{
 					$this->notNew[] = $key_pointer;
 				}
-				$versionData->move->static->$key_pointer->type = 'file';
+				else
-				$versionData->move->static->$key_pointer->custom = $customPath;
+				{
+					// update the file content
+					$this->updateFileContent[$key_pointer] = true;
+				}
 			}
 			unset($this->componentData->files);
 			unset($custom);

admin/helpers/compiler/c_Fields.php

@@ -1353,13 +1353,25 @@ class Fields extends Structure
 				// only continue if we have a field set
 				if (ComponentbuilderHelper::checkArray($fieldsSets))
 				{
-					foreach ($fieldsSets as $fieldId)
+					// set the resolver
+					$_resolverKey = $fieldAttributes['name'];
+					// load the field data
+					$fieldsSets = array_map(function($id) use($view_name_single, $view_name_list, $_resolverKey) {
+						// start field
+						$field = array();
+						$field['field'] = $id;
+						// set the field details
+						$this->setFieldDetails($field, $view_name_single, $view_name_list, $_resolverKey);
+						// return field
+						return $field;
+					}, array_values($fieldsSets));
+					// start the build
+					foreach ($fieldsSets as $fieldData)
 					{
-						// get the field data
+						// if we have settings continue
-						$fieldData['settings'] = $this->getFieldData($fieldId, $view_name_single);
 						if (ComponentbuilderHelper::checkObject($fieldData['settings']))
 						{
-							$r_name = $this->getFieldName($fieldData);
+							$r_name = $this->getFieldName($fieldData, $view_name_list, $_resolverKey);
 							$r_typeName = $this->getFieldType($fieldData);
 							$r_multiple = false;
 							$r_langLabel = '';
@@ -1440,13 +1452,25 @@ class Fields extends Structure
 				// only continue if we have a field set
 				if (ComponentbuilderHelper::checkArray($fieldsSets))
 				{
-					foreach ($fieldsSets as $fieldId)
+					// set the resolver
+					$_resolverKey = $fieldAttributes['name'];
+					// load the field data
+					$fieldsSets = array_map(function($id) use($view_name_single, $view_name_list, $_resolverKey) {
+						// start field
+						$field = array();
+						$field['field'] = $id;
+						// set the field details
+						$this->setFieldDetails($field, $view_name_single, $view_name_list, $_resolverKey);
+						// return field
+						return $field;
+					}, array_values($fieldsSets));
+					// start the build
+					foreach ($fieldsSets as $fieldData)
 					{
-						// get the field data
+						// if we have settings continue
-						$fieldData['settings'] = $this->getFieldData($fieldId, $view_name_single);
 						if (ComponentbuilderHelper::checkObject($fieldData['settings']))
 						{
-							$r_name = $this->getFieldName($fieldData);
+							$r_name = $this->getFieldName($fieldData, $view_name_list, $_resolverKey);
 							$r_typeName = $this->getFieldType($fieldData);
 							$r_multiple = false;
 							$r_langLabel = '';
@@ -1691,14 +1715,25 @@ class Fields extends Structure
 				// only continue if we have a field set
 				if (ComponentbuilderHelper::checkArray($fieldsSets))
 				{
-					foreach ($fieldsSets as $fieldId)
+					// set the resolver
+					$_resolverKey = $fieldAttributes['name'];
+					// load the field data
+					$fieldsSets = array_map(function($id) use($view_name_single, $view_name_list, $_resolverKey) {
+						// start field
+						$field = array();
+						$field['field'] = $id;
+						// set the field details
+						$this->setFieldDetails($field, $view_name_single, $view_name_list, $_resolverKey);
+						// return field
+						return $field;
+					}, array_values($fieldsSets));
+					// start the build
+					foreach ($fieldsSets as $fieldData)
 					{
-						// get the field data
+						// if we have settings continue
-						$fieldData = array();
-						$fieldData['settings'] = $this->getFieldData($fieldId, $view_name_single);
 						if (ComponentbuilderHelper::checkObject($fieldData['settings']))
 						{
-							$r_name = $this->getFieldName($fieldData);
+							$r_name = $this->getFieldName($fieldData, $view_name_list, $_resolverKey);
 							$r_typeName = $this->getFieldType($fieldData);
 							$r_multiple = false;
 							$r_langLabel = '';
@@ -1788,14 +1823,25 @@ class Fields extends Structure
 					// only continue if we have a field set
 					if (ComponentbuilderHelper::checkArray($fieldsSets))
 					{
-						foreach ($fieldsSets as $fieldId)
+						// set the resolver
+						$_resolverKey = $fieldAttributes['name'];
+						// load the field data
+						$fieldsSets = array_map(function($id) use($view_name_single, $view_name_list, $_resolverKey) {
+							// start field
+							$field = array();
+							$field['field'] = $id;
+							// set the field details
+							$this->setFieldDetails($field, $view_name_single, $view_name_list, $_resolverKey);
+							// return field
+							return $field;
+						}, array_values($fieldsSets));
+						// start the build
+						foreach ($fieldsSets as $fieldData)
 						{
-							// get the field data
+							// if we have settings continue
-							$fieldData = array();
-							$fieldData['settings'] = $this->getFieldData($fieldId, $view_name_single);
 							if (ComponentbuilderHelper::checkObject($fieldData['settings']))
 							{
-								$r_name = $this->getFieldName($fieldData);
+								$r_name = $this->getFieldName($fieldData, $view_name_list, $_resolverKey);
 								$r_typeName = $this->getFieldType($fieldData);
 								$r_multiple = false;
 								$r_langLabel = '';
@@ -2051,6 +2097,11 @@ class Fields extends Structure
 		if (!ComponentbuilderHelper::fieldCheck($typeName))
 		{
 			$fieldAttributes['custom'] = array();
+			// is this an own custom field
+			if (isset($field['settings']->own_custom))
+			{
+				$fieldAttributes['custom']['own_custom'] = $field['settings']->own_custom;
+			}
 			$setCustom = true;
 		}
 		// setup a default field
@@ -2089,23 +2140,21 @@ class Fields extends Structure
 				}
 				elseif ($property['name'] === 'extension' || $property['name'] === 'directory' || $property['name'] === 'formsource')
 				{
-					$xmlValue = ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"');
+					// get value & replace the placeholders
-					// replace the placeholders
+					$xmlValue = $this->setPlaceholders(ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"'), $placeholders);
-					$xmlValue = $this->setPlaceholders($xmlValue, $placeholders);
 				}
-				elseif (strpos($property['name'], 'type_php_') !== false && $setCustom)
+				// catch all PHP here
+				elseif (strpos($property['name'], 'type_php') !== false && $setCustom)
 				{
 					// set the line number
-					$phpLine = (int) str_replace('type_php_', '', $property['name']);
+					$phpLine = (int) preg_replace('/[^0-9]/', '', $property['name']);
+					// set the type key
+					$phpKey = (string) trim( str_replace('type_', '', preg_replace('/[0-9]+/', '', $property['name'])), '_');
 					// load the php for the custom field file
-					$fieldAttributes['custom']['php'][$phpLine] = ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"');
+					$fieldAttributes['custom'][$phpKey][$phpLine] =
-				}
+						$this->setDynamicValues(ComponentbuilderHelper::openValidBase64(
-				elseif (strpos($property['name'], 'type_phpx_') !== false && $setCustom)
+							ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"')
-				{
+						));
-					// set the line number
-					$phpLine = (int) str_replace('type_phpx_', '', $property['name']);
-					// load the php for the custom field file
-					$fieldAttributes['custom']['phpx'][$phpLine] = ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"');
 				}
 				elseif ($property['name'] === 'prime_php' && $setCustom)
 				{
@@ -2119,27 +2168,23 @@ class Fields extends Structure
 				}
 				elseif ($property['name'] === 'view' && $setCustom)
 				{
-					// load the view name
+					// load the view name & replace the placeholders
-					$fieldAttributes['custom']['view'] = ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($field['settings']->xml, 'view="', '"'));
+					$fieldAttributes['custom']['view'] = ComponentbuilderHelper::safeString($this->setPlaceholders(ComponentbuilderHelper::getBetween($field['settings']->xml, 'view="', '"'), $placeholders));
 				}
 				elseif ($property['name'] === 'views' && $setCustom)
 				{
-					// load the views name
+					// load the views name & replace the placeholders
-					$fieldAttributes['custom']['views'] = ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($field['settings']->xml, 'views="', '"'));
+					$fieldAttributes['custom']['views'] = ComponentbuilderHelper::safeString($this->setPlaceholders(ComponentbuilderHelper::getBetween($field['settings']->xml, 'views="', '"'), $placeholders));
 				}
 				elseif ($property['name'] === 'component' && $setCustom)
 				{
-					// load the component name
+					// load the component name & replace the placeholders
-					$fieldAttributes['custom']['component'] = ComponentbuilderHelper::getBetween($field['settings']->xml, 'component="', '"');
+					$fieldAttributes['custom']['component'] = $this->setPlaceholders(ComponentbuilderHelper::getBetween($field['settings']->xml, 'component="', '"'), $placeholders);
-					// replace the placeholders
-					$fieldAttributes['custom']['component'] = $this->setPlaceholders($fieldAttributes['custom']['component'], $placeholders);
 				}
 				elseif ($property['name'] === 'table' && $setCustom)
 				{
-					// load the main table that is queried
+					// load the main table that is queried & replace the placeholders
-					$fieldAttributes['custom']['table'] = ComponentbuilderHelper::getBetween($field['settings']->xml, 'table="', '"');
+					$fieldAttributes['custom']['table'] = $this->setPlaceholders(ComponentbuilderHelper::getBetween($field['settings']->xml, 'table="', '"'), $placeholders);
-					// replace the placeholders
-					$fieldAttributes['custom']['table'] = $this->setPlaceholders($fieldAttributes['custom']['table'], $placeholders);
 				}
 				elseif ($property['name'] === 'value_field' && $setCustom)
 				{
@@ -2286,6 +2331,12 @@ class Fields extends Structure
 					// now set the value
 					$fieldAttributes[$property['name']] = $xmlValue;
 				}
+				// validate that the default field is set
+				elseif ($property['name'] === 'default' && ($xmlValidateValue = ComponentbuilderHelper::getBetween($field['settings']->xml, 'default="', '"', 'none-set')) !== 'none-set')
+				{
+					// we must allow empty defaults
+					$fieldAttributes['default'] = $xmlValue;
+				}
 			}
 			// do some nice twigs beyond the default
 			if (isset($fieldAttributes['name']))
@@ -2730,119 +2781,165 @@ class Fields extends Structure
 	public function setCustomFieldTypeFile($data, $view_name_list, $view_name_single)
 	{
 		// make sure it is not already been build or if it is prime
-		if ((isset($data['custom']['prime_php']) && $data['custom']['prime_php'] == 1) || !isset($this->fileContentDynamic['customfield_' . $data['type']]) || !ComponentbuilderHelper::checkArray($this->fileContentDynamic['customfield_' . $data['type']]))
+		if (isset($data['custom']) && isset($data['custom']['extends']) && ((isset($data['custom']['prime_php']) && $data['custom']['prime_php'] == 1) || !isset($this->fileContentDynamic['customfield_' . $data['type']]) || !ComponentbuilderHelper::checkArray($this->fileContentDynamic['customfield_' . $data['type']])))
 		{
-			// first build the custom field type file
-			$target = array('admin' => 'customfield');
-			$this->buildDynamique($target, 'field' . $data['custom']['extends'], $data['custom']['type']);
 			// set tab and break replacements
 			$tabBreak = array(
 				'\t' => $this->_t(1),
 				'\n' => PHP_EOL
 			);
-			// make field dynamic
+			// set the [[[PLACEHOLDER]]] options
 			$replace = array(
-				$this->hhh . 'TABLE' . $this->hhh => $data['custom']['table'],
+				$this->bbb . 'TABLE' . $this->ddd => $data['custom']['table'],
-				$this->hhh . 'ID' . $this->hhh => $data['custom']['id'],
+				$this->bbb . 'ID' . $this->ddd => $data['custom']['id'],
-				$this->hhh . 'TEXT' . $this->hhh => $data['custom']['text'],
+				$this->bbb . 'TEXT' . $this->ddd => $data['custom']['text'],
-				$this->hhh . 'CODE_TEXT' . $this->hhh => $data['code'] . '_' . $data['custom']['text'],
+				$this->bbb . 'CODE_TEXT' . $this->ddd => $data['code'] . '_' . $data['custom']['text'],
-				$this->hhh . 'CODE' . $this->hhh => $data['code'],
+				$this->bbb . 'CODE' . $this->ddd => $data['code'],
-				$this->hhh . 'component' . $this->hhh => $this->fileContentStatic[$this->hhh . 'component' . $this->hhh],
+				$this->bbb . 'view_type' . $this->ddd => $view_name_single . '_' . $data['type'],
-				$this->hhh . 'Component' . $this->hhh => $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh],
+				$this->bbb . 'type' . $this->ddd => $data['type'],
-				$this->hhh . 'view_type' . $this->hhh => $view_name_single . '_' . $data['type'],
+				$this->bbb . 'com_component' . $this->ddd => (isset($data['custom']['component']) && ComponentbuilderHelper::checkString($data['custom']['component'])) ? ComponentbuilderHelper::safeString($data['custom']['component']) : 'com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh],
-				$this->hhh . 'type' . $this->hhh => $data['type'],
+				// set the generic values
-				$this->hhh . 'view' . $this->hhh => $view_name_single,
+				$this->bbb . 'component' . $this->ddd => $this->fileContentStatic[$this->hhh . 'component' . $this->hhh],
-				$this->hhh . 'views' . $this->hhh => $view_name_list
+				$this->bbb . 'Component' . $this->ddd => $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh],
+				$this->bbb . 'view' . $this->ddd => (isset($data['custom']['view']) && ComponentbuilderHelper::checkString($data['custom']['view'])) ? ComponentbuilderHelper::safeString($data['custom']['view']) : $view_name_single,
+				$this->bbb . 'views' . $this->ddd => (isset($data['custom']['views']) && ComponentbuilderHelper::checkString($data['custom']['views'])) ? ComponentbuilderHelper::safeString($data['custom']['views']) : $view_name_list
 			);
-			// now load the php script
+			// now set the ###PLACEHOLDER### options
-			if (isset($data['custom']['php']) && ComponentbuilderHelper::checkArray($data['custom']['php']))
+			foreach ($replace as $replacekey => $replacevalue)
 			{
-				// make sure the ar is reset
+				// update the key value
-				$phpCode = '';
+				$replacekey = str_replace(array($this->bbb, $this->ddd), array($this->hhh, $this->hhh), $replacekey);
-				foreach ($data['custom']['php'] as $line => $code)
+				// now set the value
+				$replace[$replacekey] = $replacevalue;
+			}
+			// start loading the field type
+			$this->fileContentDynamic['customfield_' . $data['type']] = array();
+			// Type <<<DYNAMIC>>>
+			$this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'Type' . $this->hhh] = ComponentbuilderHelper::safeString($data['custom']['type'], 'F');
+			// type <<<DYNAMIC>>>
+			$this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'type' . $this->hhh] = ComponentbuilderHelper::safeString($data['custom']['type']);
+			// is this a own custom field
+			if (isset($data['custom']['own_custom']))
+			{
+				// make sure the button option notice is set to notify the developer that the button option is not available in own custom field types
+				if (isset($data['custom']['add_button']) && ($data['custom']['add_button'] === 'true' || 1 == $data['custom']['add_button']))
 				{
-					if (ComponentbuilderHelper::checkString($code))
+					// set error
+					$this->app->enqueueMessage(JText::_('<hr /><h3>Dynamic Button Error</h3>'), 'Error');
+					$this->app->enqueueMessage(JText::_('The option to add a dynamic button is not available in <b>own custom field types</b>, you will have to custom code it.'), 'Error');
+				}
+				// load another file
+				$target = array('admin' => 'customfield');
+				$this->buildDynamique($target, 'fieldcustom', $data['custom']['type']);
+				// JFORM_extens <<<DYNAMIC>>>
+				$this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'JFORM_extends' . $this->hhh] = ComponentbuilderHelper::safeString($data['custom']['extends']);
+				// JFORM_EXTENDS <<<DYNAMIC>>>
+				$this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'JFORM_EXTENDS' . $this->hhh] = ComponentbuilderHelper::safeString($data['custom']['extends'], 'F');
+				// JFORM_TYPE_PHP <<<DYNAMIC>>>
+				$this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'JFORM_TYPE_PHP' . $this->hhh] = PHP_EOL . PHP_EOL . $this->_t(1) . "//" . $this->setLine(__LINE__) . " A " . $data['custom']['own_custom'] . " Field";
+				// load the other PHP options
+				foreach (ComponentbuilderHelper::$phpFieldArray as $x)
+				{
+					// reset the php bucket
+					$phpBucket = '';
+					// only set if avaliable
+					if (isset($data['custom']['php' . $x]) && ComponentbuilderHelper::checkArray($data['custom']['php' . $x]))
 					{
-						if ($line == 1)
+						foreach ($data['custom']['php' . $x] as $line => $code)
 						{
-							$phpCode .= $this->setPlaceholders($code, $tabBreak);
+							if (ComponentbuilderHelper::checkString($code))
-						}
+							{
-						else
+								$phpBucket .= PHP_EOL . $this->setPlaceholders($code, $tabBreak);
-						{
+							}
-							$phpCode .= PHP_EOL . $this->_t(2) . $this->setPlaceholders($code, $tabBreak);
 						}
+						// JFORM_TYPE_PHP <<<DYNAMIC>>>
+						$this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'JFORM_TYPE_PHP' . $this->hhh] .= PHP_EOL . $this->setPlaceholders($phpBucket, $replace);
 					}
 				}
-				// replace the placholders
-				$phpCode = $this->setPlaceholders($phpCode, $replace);
 			}
 			else
 			{
-				$phpCode = 'return null;';
+				// first build the custom field type file
-			}
+				$target = array('admin' => 'customfield');
-			// catch empty stuff
+				$this->buildDynamique($target, 'field' . $data['custom']['extends'], $data['custom']['type']);
-			if (!ComponentbuilderHelper::checkString($phpCode))
+				// make sure the value is reset
-			{
+				$phpCode = '';
-				$phpCode = 'return null;';
+				// now load the php script
-			}
+				if (isset($data['custom']['php']) && ComponentbuilderHelper::checkArray($data['custom']['php']))
-			// some house cleaning for users
-			if ($data['custom']['extends'] === 'user')
-			{
-				// now load the php xclude script
-				if (ComponentbuilderHelper::checkArray($data['custom']['phpx']))
 				{
-					// make sure the ar is reset
+					foreach ($data['custom']['php'] as $line => $code)
-					$phpxCode = '';
-					foreach ($data['custom']['phpx'] as $line => $code)
 					{
 						if (ComponentbuilderHelper::checkString($code))
 						{
 							if ($line == 1)
 							{
-								$phpxCode .= $this->setPlaceholders($code, $tabBreak);
+								$phpCode .= $this->setPlaceholders($code, $tabBreak);
 							}
 							else
 							{
-								$phpxCode .= PHP_EOL . $this->_t(2) . $this->setPlaceholders($code, $tabBreak);
+								$phpCode .= PHP_EOL . $this->_t(2) . $this->setPlaceholders($code, $tabBreak);
 							}
 						}
 					}
 					// replace the placholders
-					$phpxCode = $this->setPlaceholders($phpxCode, $replace);
+					$phpCode = $this->setPlaceholders($phpCode, $replace);
+				}
+				// catch empty stuff
+				if (!ComponentbuilderHelper::checkString($phpCode))
+				{
+					$phpCode = 'return null;';
+				}
+				// some house cleaning for users
+				if ($data['custom']['extends'] === 'user')
+				{
+					// make sure the value is reset
+					$phpxCode = '';
+					// now load the php xclude script
+					if (ComponentbuilderHelper::checkArray($data['custom']['phpx']))
+					{
+						foreach ($data['custom']['phpx'] as $line => $code)
+						{
+							if (ComponentbuilderHelper::checkString($code))
+							{
+								if ($line == 1)
+								{
+									$phpxCode .= $this->setPlaceholders($code, $tabBreak);
+								}
+								else
+								{
+									$phpxCode .= PHP_EOL . $this->_t(2) . $this->setPlaceholders($code, $tabBreak);
+								}
+							}
+						}
+						// replace the placholders
+						$phpxCode = $this->setPlaceholders($phpxCode, $replace);
+					}
+					// catch empty stuff
+					if (!ComponentbuilderHelper::checkString($phpxCode))
+					{
+						$phpxCode = 'return null;';
+					}
+					// temp holder for name
+					$tempName = $data['custom']['label'] . ' Group';
+					// set lang
+					$groupLangName = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($tempName, 'U');
+					// add to lang array
+					$this->langContent[$this->lang][$groupLangName] = ComponentbuilderHelper::safeString($tempName, 'W');
+					// build the Group Control
+					$this->setGroupControl[$data['type']] = $groupLangName;
+					// JFORM_GETGROUPS_PHP <<<DYNAMIC>>>
+					$this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'JFORM_GETGROUPS_PHP' . $this->hhh] = $phpCode;
+					// JFORM_GETEXCLUDED_PHP <<<DYNAMIC>>>
+					$this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'JFORM_GETEXCLUDED_PHP' . $this->hhh] = $phpxCode;
 				}
 				else
 				{
-					$phpxCode = 'return null;';
+					// JFORM_GETOPTIONS_PHP <<<DYNAMIC>>>
+					$this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'JFORM_GETOPTIONS_PHP' . $this->hhh] = $phpCode;
 				}
-				if (!ComponentbuilderHelper::checkString($phpxCode))
+				// type <<<DYNAMIC>>>
-				{
+				$this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'ADD_BUTTON' . $this->hhh] = $this->setAddButtonToListField($data['custom']);
-					$phpxCode = 'return null;';
-				}
-				// temp holder for name
-				$tempName = $data['custom']['label'] . ' Group';
-				// set lang
-				$groupLangName = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($tempName, 'U');
-				// add to lang array
-				$this->langContent[$this->lang][$groupLangName] = ComponentbuilderHelper::safeString($tempName, 'W');
-				// build the Group Control
-				$this->setGroupControl[$data['type']] = $groupLangName;
-				// JFORM_GETGROUPS_PHP <<<DYNAMIC>>>
-				$this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'JFORM_GETGROUPS_PHP' . $this->hhh] = $phpCode;
-
-				// JFORM_GETEXCLUDED_PHP <<<DYNAMIC>>>
-				$this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'JFORM_GETEXCLUDED_PHP' . $this->hhh] = $phpxCode;
 			}
-			else
-			{
-				// JFORM_GETOPTIONS_PHP <<<DYNAMIC>>>
-				$this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'JFORM_GETOPTIONS_PHP' . $this->hhh] = $phpCode;
-			}
-			// Type <<<DYNAMIC>>>
-			$this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'Type' . $this->hhh] = ComponentbuilderHelper::safeString($data['custom']['type'], 'F');
-			// type <<<DYNAMIC>>>
-			$this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'type' . $this->hhh] = $data['custom']['type'];
-			// type <<<DYNAMIC>>>
-			$this->fileContentDynamic['customfield_' . $data['type']][$this->hhh . 'ADD_BUTTON' . $this->hhh] = $this->setAddButtonToListField($data['custom']);
 		}
 	}
 
@@ -3073,7 +3170,8 @@ class Fields extends Structure
 			// set the warning only once
 			$this->setTidyWarning = true;
 			// now set the warning
-			$this->app->enqueueMessage(JText::_('You must enable the <b>Tidy</b> extension in your php.ini file so we can tidy up your xml! If you need help please <a href="https://github.com/vdm-io/Joomla-Component-Builder/issues/197#issuecomment-351181754" target="_blank">start here</a>!'), 'error');
+			$this->app->enqueueMessage(JText::_('<hr /><h3>Tidy Error</h3>'), 'Error');
+			$this->app->enqueueMessage(JText::_('You must enable the <b>Tidy</b> extension in your php.ini file so we can tidy up your xml! If you need help please <a href="https://github.com/vdm-io/Joomla-Component-Builder/issues/197#issuecomment-351181754" target="_blank">start here</a>!'), 'Error');
 		}
 		return $xmlString;
 	}

admin/helpers/compiler/e_Interpretation.php

@@ -613,7 +613,8 @@ class Interpretation extends Fields
 			}
 		}
 		// give notice of this issue
-		$this->app->enqueueMessage(JText::sprintf('The <b>WHMCS class</b> could not be added to this component. You will need to enable the add-on in the Joomla Component area (Add WHMCS)->Yes.', $this->libraries[$id]->name), 'error');
+		$this->app->enqueueMessage(JText::_('<hr /><h3>WHMCS Error</h3>'), 'Error');
+		$this->app->enqueueMessage(JText::sprintf('The <b>WHMCS class</b> could not be added to this component. You will need to enable the add-on in the Joomla Component area (Add WHMCS)->Yes.', $this->libraries[$id]->name), 'Error');
 		return "//" . $this->setLine(__LINE__) . " The WHMCS class could not be added to this component." . PHP_EOL . "//" . $this->setLine(__LINE__) . " Please note that you will need to enable the add-on in the Joomla Component area (Add WHMCS)->Yes.";
 	}
 
@@ -624,8 +625,9 @@ class Interpretation extends Fields
 	 */
 	public function setGetCryptKey()
 	{
-		// ENCRYPT_FILE
+		// WHMCS_ENCRYPT_FILE
-		$this->fileContentStatic[$this->hhh . 'ENCRYPT_FILE' . $this->hhh] = '';
+		$this->fileContentStatic[$this->hhh . 'WHMCS_ENCRYPT_FILE' . $this->hhh] = '';
+		// check if encryption is ative
 		if ((isset($this->basicEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->basicEncryptionBuilder)) ||
 			(isset($this->mediumEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->mediumEncryptionBuilder)) ||
 			(isset($this->whmcsEncryptionBuilder) && ComponentbuilderHelper::checkArray($this->whmcsEncryptionBuilder)) ||
@@ -2073,9 +2075,17 @@ class Interpretation extends Fields
 			foreach ($order as $or)
 			{
 				list($as, $field) = array_map('trim', explode('.', $or['table_key']));
-
+				// check if random
-				// set the string
+				if ('RAND' === $or['direction'])
-				$string = "\$query->order('" . $or['table_key'] . " " . $or['direction'] . "');";
+				{
+					// set the string
+					$string = "\$query->order('RAND()');";
+				}
+				else
+				{
+					// set the string
+					$string = "\$query->order('" . $or['table_key'] . " " . $or['direction'] . "');";
+				}
 				// sort where
 				if ($as === 'a' || (isset($this->siteMainGet[$this->target][$code][$as]) && ComponentbuilderHelper::checkString($this->siteMainGet[$this->target][$code][$as])))
 				{
@@ -3890,7 +3900,8 @@ class Interpretation extends Fields
 		// Start script builder for library files
 		if (!isset($this->libwarning[$id]))
 		{
-			$this->app->enqueueMessage(JText::sprintf('The conditional script builder for <b>%s</b> is not ready, sorry!', $this->libraries[$id]->name), 'warning');
+			$this->app->enqueueMessage(JText::_('<hr /><h3>Conditional Script Warning</h3>'), 'Warning');
+			$this->app->enqueueMessage(JText::sprintf('The conditional script builder for <b>%s</b> is not ready, sorry!', $this->libraries[$id]->name), 'Warning');
 			// set the warning only once
 			$this->libwarning[$id] = true;
 		}
@@ -6314,7 +6325,23 @@ class Interpretation extends Fields
 						$db_ .= "," . PHP_EOL . $this->_t(1) . "KEY `idx_" . $key . "` (`" . $key . "`)";
 					}
 				}
-				$db_ .= PHP_EOL . ") ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;";
+				// easy bucket
+				$easy = array();
+				// get the mysql table settings
+				foreach ($this->mysqlTableKeys as $_mysqlTableKey => $_mysqlTableVal)
+				{
+					if (isset($this->mysqlTableSetting[$view]) 
+						&& ComponentbuilderHelper::checkArray($this->mysqlTableSetting[$view]) 
+						&& isset($this->mysqlTableSetting[$view][$_mysqlTableKey]))
+					{
+						$easy[$_mysqlTableKey] = $this->mysqlTableSetting[$view][$_mysqlTableKey];
+					}
+					else
+					{
+						$easy[$_mysqlTableKey] = $this->mysqlTableKeys[$_mysqlTableKey]['default'];
+					}
+				}
+				$db_ .= PHP_EOL . ") ENGINE=" . $easy['engine'] . " AUTO_INCREMENT=0 DEFAULT CHARSET=" . $easy['charset'] . " DEFAULT COLLATE=" . $easy['collate'] . ";";
 
 				// check if this is a new table that should be added via update SQL
 				if (isset($this->addSQL['adminview']) && ComponentbuilderHelper::checkArray($this->addSQL['adminview']) && in_array($view, $this->addSQL['adminview']))
@@ -6322,6 +6349,19 @@ class Interpretation extends Fields
 					// build the update array
 					$this->updateSQLBuilder["CREATETABLEIFNOTEXISTS`#__" . $component . "_" . $view . "`"] = $db_;
 				}
+				// check if the table engine has changed
+				if (isset($this->updateSQL['table_engine']) && isset($this->updateSQL['table_engine'][$view]))
+				{
+					// build the update array
+					$this->updateSQLBuilder["ALTERTABLE`#__" . $component . "_" . $view . "`ENGINE=" . $easy['engine']] = "ALTER TABLE `#__" . $component . "_" . $view . "` ENGINE = " . $easy['engine'] . ";";
+				}
+				// check if the table charset OR collation has changed (must be updated together)
+				if ((isset($this->updateSQL['table_charset']) && isset($this->updateSQL['table_charset'][$view])) ||
+					(isset($this->updateSQL['table_collate']) && isset($this->updateSQL['table_collate'][$view])))
+				{
+					// build the update array
+					$this->updateSQLBuilder["ALTERTABLE`#__" . $component . "_" . $view . "CONVERTTOCHARACTERSET" . $easy['charset'] . "COLLATE" . $easy['collate']] = "ALTER TABLE `#__" . $component . "_" . $view . "` CONVERT TO CHARACTER SET " . $easy['charset'] . " COLLATE " . $easy['collate'] . ";";
+				}
 
 				// add to main DB string
 				$db .= $db_ . PHP_EOL . PHP_EOL;
@@ -7637,7 +7677,8 @@ class Interpretation extends Fields
 						}
 						else
 						{
-							$this->app->enqueueMessage(JText::sprintf('Your <b>%s</b> field could not be added, since the <b>%s</b> alignment position is not available in the %s (publishing) tab. Please only target <b>Left or right</b> in the publishing tab.', $df_name, $alignmentNames[$df_alignment], $viewName_single), 'warning');
+							$this->app->enqueueMessage(JText::_('<hr /><h3>Field Warning</h3>'), 'Warning');
+							$this->app->enqueueMessage(JText::sprintf('Your <b>%s</b> field could not be added, since the <b>%s</b> alignment position is not available in the %s (publishing) tab. Please only target <b>Left or right</b> in the publishing tab.', $df_name, $alignmentNames[$df_alignment], $viewName_single), 'Warning');
 						}
 					}
 				}
@@ -7700,6 +7741,7 @@ class Interpretation extends Fields
 					// only triger the info notice if there were custom fields targeted to the right alignment position.
 					if ($fieldsAddedRight)
 					{
+						$this->app->enqueueMessage(JText::_('<hr /><h3>Field Notice</h3>'), 'Notice');
 						$this->app->enqueueMessage(JText::sprintf('Your field/s added to the <b>right</b> alignment position in the %s (publishing) tab was added to the <b>left</b>. Since we have metadata fields on the right. Fields can only be loaded to the right of the publishing tab if there is no metadata fields.', $viewName_single), 'Notice');
 					}
 					// set the publishing layout
@@ -10594,7 +10636,7 @@ class Interpretation extends Fields
 					$codeName = $filter['code'] . ComponentbuilderHelper::safeString($filter['custom']['text'], 'F');
 					$type = ComponentbuilderHelper::safeString($filter['custom']['type'], 'F');
 					$otherFilter[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Set " . $CodeName . " Selection";
-					$otherFilter[] = $this->_t(2) . "\$this->" . $codeName . "Options = JFormHelper::loadFieldType('" . $type . "')->getOptions();";
+					$otherFilter[] = $this->_t(2) . "\$this->" . $codeName . "Options = JFormHelper::loadFieldType('" . $type . "')->options;";
 					$otherFilter[] = $this->_t(2) . "if (\$this->" . $codeName . "Options)";
 					$otherFilter[] = $this->_t(2) . "{";
 					$otherFilter[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " " . $CodeName . " Filter";
@@ -13358,17 +13400,37 @@ class Interpretation extends Fields
 			$lang = $this->langPrefix . '_MENU';
 			// set the code name
 			$codeName = ComponentbuilderHelper::safeString($this->componentData->name_code);
-			// set main menu name to lang
+			// default prefix is none
-			$addPrefix = $this->params->get('add_menu_prefix', 1);
+			$prefix = '';
+			// check if local is set
+			if (isset($this->componentData->add_menu_prefix) && is_numeric($this->componentData->add_menu_prefix))
+			{
+				// set main menu prefix switch
+				$addPrefix = $this->componentData->add_menu_prefix;
+				if ($addPrefix == 1 && isset($this->componentData->menu_prefix) && ComponentbuilderHelper::checkString($this->componentData->menu_prefix))
+				{
+					$prefix = trim($this->componentData->menu_prefix) . ' ';
+				}
+			}
+			else
+			{
+				// set main menu prefix switch
+				$addPrefix = $this->params->get('add_menu_prefix', 1);
+				if ($addPrefix == 1)
+				{
+					$prefix = trim($this->params->get('menu_prefix', '&#187;')) . ' ';
+				}
+			}
+			// add the prefix
 			if ($addPrefix == 1)
 			{
-				$prefix = trim($this->params->get('menu_prefix', '&#187;'));
+				$this->langContent['adminsys'][$lang] = $prefix . $this->componentData->name;
-				$this->langContent['adminsys'][$lang] = $prefix . ' ' . $this->componentData->name;
 			}
 			else
 			{
 				$this->langContent['adminsys'][$lang] = $this->componentData->name;
 			}
+			// loop over the admin views
 			foreach ($this->componentData->admin_views as $view)
 			{
 				// set custom menu
@@ -15401,7 +15463,7 @@ function vdm_dkim() {
 									foreach ($field['permission'] as $permission_id)
 									{
 										// set the permission key word
-										$permission_option = $permission_options[$permission_id];
+										$permission_option = $permission_options[ (int) $permission_id];
 										// reset the bucket
 										$fieldView = array();
 										// set the permission for this field

admin/helpers/compiler/f_Infusion.php

@@ -175,9 +175,6 @@ class Infusion extends Interpretation
 			// ADMIN_GLOBAL_EVENT
 			$this->fileContentStatic[$this->hhh . 'ADMIN_GLOBAL_EVENT' . $this->hhh] = '';
 
-			// set incase no extra admin files are loaded
-			$this->fileContentStatic[$this->hhh . 'EXSTRA_ADMIN_FILES' . $this->hhh] = '';
-
 			// now load the data for the global event if needed
 			if ($this->componentData->add_admin_event == 1)
 			{

admin/helpers/componentbuilder.php

@@ -32,6 +32,11 @@ abstract class ComponentbuilderHelper
 	**/
 	public static $libraryNames = array(1 => 'No Library', 2 => 'Bootstrap v4', 3 => 'Uikit v3', 4 => 'Uikit v2', 5 => 'FooTable v2', 6 => 'FooTable v3');
 
+	/**
+	* 	Array of php fields Allowed (16)
+	**/
+	public static $phpFieldArray = array('', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'x');
+
 	/**
 	* 	The global params
 	**/
@@ -670,7 +675,7 @@ abstract class ComponentbuilderHelper
 		if ($db->getNumRows())
 		{
 			$result = $db->loadObject();
-			$properties = json_decode($result->properties,true);
+			$properties = json_decode($result->properties, true);
 			$field = array(
 				'subform' => array(),
 				'nameListOptions' => array(),
@@ -684,11 +689,11 @@ abstract class ComponentbuilderHelper
 			// value to check since there are false and null values even 0 in the values returned
 			$confirmation = '8qvZHoyuFYQqpj0YQbc6F3o5DhBlmS-_-a8pmCZfOVSfANjkmV5LG8pCdAY2JNYu6cB';
 			// set the headers
-			$field['values_description'] .= '<thead><tr><th class="uk-text-right">'.JText::_('COM_COMPONENTBUILDER_PROPERTY').'</th><th>'.JText::_('COM_COMPONENTBUILDER_EXAMPLE').'</th><th>'.JText::_('COM_COMPONENTBUILDER_DESCRIPTION').'</th></thead><tbody>';
+			$field['values_description'] .= '<thead><tr><th class="uk-text-right">' . JText::_('COM_COMPONENTBUILDER_PROPERTY') . '</th><th>' . JText::_('COM_COMPONENTBUILDER_EXAMPLE') . '</th><th>' . JText::_('COM_COMPONENTBUILDER_DESCRIPTION') . '</th></thead><tbody>';
 			foreach ($properties as $property)
 			{
 				$example = (isset($property['example']) && self::checkString($property['example'])) ? $property['example'] : '';
-				$field['values_description'] .= '<tr><td class="uk-text-right"><code>'.$property['name'].'</code></td><td>'.$example.'</td><td>'.$property['description'].'</td></tr>';
+				$field['values_description'] .= '<tr><td class="uk-text-right"><code>' . $property['name'] . '</code></td><td>' . $example . '</td><td>' . $property['description'] . '</td></tr>';
 				// check if we should load the value
 				$value = self::getValueFromXMLstring($xml, $property['name'], $confirmation);
 				// check if this is a php field
@@ -709,7 +714,7 @@ abstract class ComponentbuilderHelper
 				if(self::checkArray($settings) && isset($settings[$property['name']]))
 				{
 					// add the xml values
-					$field['values'] .= PHP_EOL."\t".$property['name'].'="'.$settings[$property['name']].'" ';
+					$field['values'] .= PHP_EOL . "\t" . $property['name'] . '="'. $settings[$property['name']] . '" ';
 					// add the json values
 					if ($addPHP)
 					{
@@ -723,7 +728,7 @@ abstract class ComponentbuilderHelper
 				elseif (!$xml || $confirmation !== $value)
 				{
 					// add the xml values
-					$field['values'] .= PHP_EOL."\t" . $property['name'] . '="'. ($confirmation !== $value) ? $value : $example .'" ';
+					$field['values'] .= PHP_EOL."\t" . $property['name'] . '="' . ($confirmation !== $value) ? $value : $example .'" ';
 					// add the json values
 					if ($addPHP)
 					{
@@ -742,7 +747,7 @@ abstract class ComponentbuilderHelper
 				// increment the number
 				$nr++;
 			}
-			$field['values'] .= PHP_EOL."/>";
+			$field['values'] .= PHP_EOL . "/>";
 			$field['values_description'] .= '</tbody></table>';
 			// return found field options
 			return $field;
@@ -750,11 +755,16 @@ abstract class ComponentbuilderHelper
 		return false;
 	}
 
-	public static function getValueFromXMLstring($xml, $get, $confirmation)
+	public static function getValueFromXMLstring(&$xml, &$get, $confirmation = '')
 	{
 		if (self::checkString($xml))
 		{
-			return self::getBetween($xml, $get.'="', '"', $confirmation);
+			// if we have a PHP value, we must base64 decode it
+			if (strpos($get, 'type_php') !== false)
+			{
+				return self::openValidBase64(self::getBetween($xml, $get.'="', '"', $confirmation));
+			}
+			return self::getBetween($xml, $get . '="', '"', $confirmation);
 		}
 		return $confirmation;
 	}
@@ -2026,6 +2036,10 @@ abstract class ComponentbuilderHelper
 	**/
 	public static function set($key, $value)
 	{
+		if (!isset(self::$session) || !self::checkObject(self::$session))
+		{
+			self::$session = JFactory::getSession();
+		}
 		// set to local memory to speed up program
 		self::$localSession[$key] = $value;
 		// load to session for later use
@@ -2037,6 +2051,10 @@ abstract class ComponentbuilderHelper
 	**/
 	public static function get($key, $default = null)
 	{
+		if (!isset(self::$session) || !self::checkObject(self::$session))
+		{
+			self::$session = JFactory::getSession();
+		}
 		// check if in local memory
 		if (!isset(self::$localSession[$key]))
 		{
@@ -2254,6 +2272,38 @@ abstract class ComponentbuilderHelper
 		return '<div>'.JText::_('COM_COMPONENTBUILDER_NO_COMPONENT_DETAILS_FOUND_SO_IT_IS_NOT_SAFE_TO_CONTINUE').'</div>';
 	}
 
+	/**
+	 * open base64 string if stored as base64
+	 *
+	 * @param   string   $data   The base64 string
+	 * @param   string   $key    We store the string with that suffix :)
+	 *
+	 * @return  string   The opened string
+	 *
+	 */
+	public static function openValidBase64($data, $key = '__.o0=base64=Oo.__')
+	{
+		// check that we have a string
+		if (self::checkString($data))
+		{
+			// check if we have a key
+			if (self::checkString($key))
+			{
+				if (strpos($data, $key) !== false)
+				{
+					return base64_decode(str_replace($key, '', $data));
+				}
+			}
+			// fallback to this, not perfect method
+			if (base64_encode(base64_decode($data, true)) === $data)
+			{
+				return base64_decode($data);
+			}
+		}
+		return $data;
+	}
+
+
 	/**
 	* 	prepare base64 string for url
 	**/
@@ -3656,7 +3706,7 @@ abstract class ComponentbuilderHelper
 	* @param  string   $component  The component these views belong to
 	* @param  string   $headsup    The message to show on click of button
 	*
-	* @return  string    On success the full html edit button
+	* @return  string    On success the full html link
 	* 
 	*/
 	public static function getEditButton(&$item, $view, $views, $ref = '', $component = 'com_componentbuilder', $headsup = 'COM_COMPONENTBUILDER_ALL_UNSAVED_WORK_ON_THIS_PAGE_WILL_BE_LOST_ARE_YOU_SURE_YOU_WANT_TO_CONTINUE')
@@ -3785,8 +3835,14 @@ abstract class ComponentbuilderHelper
 		{
 			// get user action permission to edit
 			$action = self::getActions($view, $record, $views, 'edit', str_replace('com_', '', $component));
+			// check if the view permission is set
+			if (($edit = $action->get($view . '.edit', 'none-set')) === 'none-set')
+			{
+				// fall back on the core permission then
+				$edit = $action->get('core.edit', 'none-set');
+			}
 			// can edit
-			if ($action->get($view . '.edit'))
+			if ($edit)
 			{
 				// set the edit link
 				if ($jRoute)

admin/language/en-GB/en-GB.com_componentbuilder.ini

@@ -541,7 +541,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_TYPE="Alias Builder Type"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_TYPE_DESCRIPTION="How should the alias be build for this view"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_TYPE_LABEL="Alias Builder Type"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ALNUM="ALNUM"
-COM_COMPONENTBUILDER_ADMIN_VIEW_ARCHIVE="Archive"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARCHIVE="ARCHIVE"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARMSCIIEIGHT_ARMSCIIEIGHT_ARMENIAN_MOST_SUITABLE_COLLATION_ARMSCIIEIGHT_GENERAL_CI="armscii8 - ARMSCII-8 Armenian (most suitable collation = armscii8_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARMSCIIEIGHT_BIN_CHARSET_ARMSCIIEIGHT="armscii8_bin (charset = armscii8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARMSCIIEIGHT_GENERAL_CI_CHARSET_ARMSCIIEIGHT="armscii8_general_ci (charset = armscii8)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ARRAY="ARRAY"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_DOWN="Arrow Down"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_DOWN_FOUR="Arrow Down 4"
@@ -561,12 +564,20 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_UP="Arrow Up"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_UP_FOUR="Arrow Up 4"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_UP_THREE="Arrow Up 3"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_UP_TWO="Arrow Up 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ASCII_BIN_CHARSET_ASCII="ascii_bin (charset = ascii)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ASCII_GENERAL_CI_CHARSET_ASCII="ascii_general_ci (charset = ascii)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ASCII_US_ASCII_MOST_SUITABLE_COLLATION_ASCII_GENERAL_CI="ascii - US ASCII (most suitable collation = ascii_general_ci)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ATTACHMENT="Attachment"
 COM_COMPONENTBUILDER_ADMIN_VIEW_BACKWARD_CIRCLE="Backward Circle"
 COM_COMPONENTBUILDER_ADMIN_VIEW_BAN_CIRCLE="Ban Circle"
 COM_COMPONENTBUILDER_ADMIN_VIEW_BARS="Bars"
 COM_COMPONENTBUILDER_ADMIN_VIEW_BASESIXTY_FOUR="BASE64"
 COM_COMPONENTBUILDER_ADMIN_VIEW_BASKET="Basket"
+COM_COMPONENTBUILDER_ADMIN_VIEW_BIGFIVE_BIGFIVE_TRADITIONAL_CHINESE_MOST_SUITABLE_COLLATION_BIGFIVE_CHINESE_CI="big5 - Big5 Traditional Chinese (most suitable collation = big5_chinese_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_BIGFIVE_BIN_CHARSET_BIGFIVE="big5_bin (charset = big5)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_BIGFIVE_CHINESE_CI_CHARSET_BIGFIVE="big5_chinese_ci (charset = big5)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_BINARY_BINARY_PSEUDO_CHARSET_MOST_SUITABLE_COLLATION_BINARY="binary - Binary pseudo charset (most suitable collation = binary)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_BINARY_CHARSET_BINARY="binary (charset = binary)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_BOOK="Book"
 COM_COMPONENTBUILDER_ADMIN_VIEW_BOOKMARK="Bookmark"
 COM_COMPONENTBUILDER_ADMIN_VIEW_BOOKMARK_TWO="Bookmark 2"
@@ -607,6 +618,37 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITCREATED="core.edit.created"
 COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITCREATED_BY="core.edit.created_by"
 COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITOWN="core.edit.own"
 COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITSTATE="core.edit.state"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPEIGHT_HUNDRED_AND_FIFTY_BIN_CHARSET_CPEIGHT_HUNDRED_AND_FIFTY="cp850_bin (charset = cp850)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPEIGHT_HUNDRED_AND_FIFTY_DOS_WEST_EUROPEAN_MOST_SUITABLE_COLLATION_CPEIGHT_HUNDRED_AND_FIFTY_GENERAL_CI="cp850 - DOS West European (most suitable collation = cp850_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPEIGHT_HUNDRED_AND_FIFTY_GENERAL_CI_CHARSET_CPEIGHT_HUNDRED_AND_FIFTY="cp850_general_ci (charset = cp850)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPEIGHT_HUNDRED_AND_FIFTY_TWO_BIN_CHARSET_CPEIGHT_HUNDRED_AND_FIFTY_TWO="cp852_bin (charset = cp852)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPEIGHT_HUNDRED_AND_FIFTY_TWO_DOS_CENTRAL_EUROPEAN_MOST_SUITABLE_COLLATION_CPEIGHT_HUNDRED_AND_FIFTY_TWO_GENERAL_CI="cp852 - DOS Central European (most suitable collation = cp852_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPEIGHT_HUNDRED_AND_FIFTY_TWO_GENERAL_CI_CHARSET_CPEIGHT_HUNDRED_AND_FIFTY_TWO="cp852_general_ci (charset = cp852)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPEIGHT_HUNDRED_AND_SIXTY_SIX_BIN_CHARSET_CPEIGHT_HUNDRED_AND_SIXTY_SIX="cp866_bin (charset = cp866)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPEIGHT_HUNDRED_AND_SIXTY_SIX_DOS_RUSSIAN_MOST_SUITABLE_COLLATION_CPEIGHT_HUNDRED_AND_SIXTY_SIX_GENERAL_CI="cp866 - DOS Russian (most suitable collation = cp866_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPEIGHT_HUNDRED_AND_SIXTY_SIX_GENERAL_CI_CHARSET_CPEIGHT_HUNDRED_AND_SIXTY_SIX="cp866_general_ci (charset = cp866)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPNINE_HUNDRED_AND_THIRTY_TWO_BIN_CHARSET_CPNINE_HUNDRED_AND_THIRTY_TWO="cp932_bin (charset = cp932)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPNINE_HUNDRED_AND_THIRTY_TWO_JAPANESE_CI_CHARSET_CPNINE_HUNDRED_AND_THIRTY_TWO="cp932_japanese_ci (charset = cp932)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPNINE_HUNDRED_AND_THIRTY_TWO_SJIS_FOR_WINDOWS_JAPANESE_MOST_SUITABLE_COLLATION_CPNINE_HUNDRED_AND_THIRTY_TWO_JAPANESE_CI="cp932 - SJIS for Windows Japanese (most suitable collation = cp932_japanese_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_BIN_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY="cp1250_bin (charset = cp1250)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_CROATIAN_CI_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY="cp1250_croatian_ci (charset = cp1250)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_CZECH_CS_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY="cp1250_czech_cs (charset = cp1250)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_GENERAL_CI_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY="cp1250_general_ci (charset = cp1250)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE_BIN_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE="cp1251_bin (charset = cp1251)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE_BULGARIAN_CI_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE="cp1251_bulgarian_ci (charset = cp1251)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE_GENERAL_CI_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE="cp1251_general_ci (charset = cp1251)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE_GENERAL_CS_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE="cp1251_general_cs (charset = cp1251)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE_UKRAINIAN_CI_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE="cp1251_ukrainian_ci (charset = cp1251)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE_WINDOWS_CYRILLIC_MOST_SUITABLE_COLLATION_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_ONE_GENERAL_CI="cp1251 - Windows Cyrillic (most suitable collation = cp1251_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_POLISH_CI_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY="cp1250_polish_ci (charset = cp1250)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SEVEN_BIN_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SEVEN="cp1257_bin (charset = cp1257)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SEVEN_GENERAL_CI_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SEVEN="cp1257_general_ci (charset = cp1257)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SEVEN_LITHUANIAN_CI_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SEVEN="cp1257_lithuanian_ci (charset = cp1257)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SEVEN_WINDOWS_BALTIC_MOST_SUITABLE_COLLATION_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SEVEN_GENERAL_CI="cp1257 - Windows Baltic (most suitable collation = cp1257_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SIX_BIN_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SIX="cp1256_bin (charset = cp1256)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SIX_GENERAL_CI_CHARSET_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SIX="cp1256_general_ci (charset = cp1256)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SIX_WINDOWS_ARABIC_MOST_SUITABLE_COLLATION_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_SIX_GENERAL_CI="cp1256 - Windows Arabic (most suitable collation = cp1256_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_WINDOWS_CENTRAL_EUROPEAN_MOST_SUITABLE_COLLATION_CPONE_THOUSAND_TWO_HUNDRED_AND_FIFTY_GENERAL_CI="cp1250 - Windows Central European (most suitable collation = cp1250_general_ci)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_DESC="The user that created this Admin View."
 COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_LABEL="Created By"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_DATE_DESC="The date this Admin View was created."
@@ -628,6 +670,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTON_LABEL="Custom Buttons"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_IMPORT="Custom Import"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DASHBOARD="Dashboard"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DATABASE="Database"
+COM_COMPONENTBUILDER_ADMIN_VIEW_DECEIGHT_BIN_CHARSET_DECEIGHT="dec8_bin (charset = dec8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_DECEIGHT_DEC_WEST_EUROPEAN_MOST_SUITABLE_COLLATION_DECEIGHT_SWEDISH_CI="dec8 - DEC West European (most suitable collation = dec8_swedish_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_DECEIGHT_SWEDISH_CI_CHARSET_DECEIGHT="dec8_swedish_ci (charset = dec8)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DEFAULT="Default"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DELETE="Delete"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION="Description"
@@ -643,6 +688,12 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ENVELOPE="Envelope"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ENVELOPE_OPENED="Envelope Opened"
 COM_COMPONENTBUILDER_ADMIN_VIEW_EQUALIZER="Equalizer"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ERROR_UNIQUE_ALIAS="Another Admin View has the same alias."
+COM_COMPONENTBUILDER_ADMIN_VIEW_EUCJPMS_BIN_CHARSET_EUCJPMS="eucjpms_bin (charset = eucjpms)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_EUCJPMS_JAPANESE_CI_CHARSET_EUCJPMS="eucjpms_japanese_ci (charset = eucjpms)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_EUCJPMS_UJIS_FOR_WINDOWS_JAPANESE_MOST_SUITABLE_COLLATION_EUCJPMS_JAPANESE_CI="eucjpms - UJIS for Windows Japanese (most suitable collation = eucjpms_japanese_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_EUCKR_BIN_CHARSET_EUCKR="euckr_bin (charset = euckr)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_EUCKR_EUCKR_KOREAN_MOST_SUITABLE_COLLATION_EUCKR_KOREAN_CI="euckr - EUC-KR Korean (most suitable collation = euckr_korean_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_EUCKR_KOREAN_CI_CHARSET_EUCKR="euckr_korean_ci (charset = euckr)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_EXIT="Exit"
 COM_COMPONENTBUILDER_ADMIN_VIEW_EXPAND="Expand"
 COM_COMPONENTBUILDER_ADMIN_VIEW_EXPAND_TWO="Expand 2"
@@ -673,14 +724,39 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_FOLDER_REMOVE="Folder Remove"
 COM_COMPONENTBUILDER_ADMIN_VIEW_FOLDER_THREE="Folder 3"
 COM_COMPONENTBUILDER_ADMIN_VIEW_FORWARD_CIRCLE="Forward Circle"
 COM_COMPONENTBUILDER_ADMIN_VIEW_FORWARD_TWO="Forward 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GBEIGHTEEN_THOUSAND_AND_THIRTY_BIN_CHARSET_GBEIGHTEEN_THOUSAND_AND_THIRTY="gb18030_bin (charset = gb18030)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GBEIGHTEEN_THOUSAND_AND_THIRTY_CHINA_NATIONAL_STANDARD_GBEIGHTEEN_THOUSAND_AND_THIRTY_MOST_SUITABLE_COLLATION_GBEIGHTEEN_THOUSAND_AND_THIRTY_CHINESE_CI="gb18030 - China National Standard GB18030 (most suitable collation = gb18030_chinese_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GBEIGHTEEN_THOUSAND_AND_THIRTY_CHINESE_CI_CHARSET_GBEIGHTEEN_THOUSAND_AND_THIRTY="gb18030_chinese_ci (charset = gb18030)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GBEIGHTEEN_THOUSAND_AND_THIRTY_UNICODE_FIVE_HUNDRED_AND_TWENTY_CI_CHARSET_GBEIGHTEEN_THOUSAND_AND_THIRTY="gb18030_unicode_520_ci (charset = gb18030)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GBK_BIN_CHARSET_GBK="gbk_bin (charset = gbk)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GBK_CHINESE_CI_CHARSET_GBK="gbk_chinese_ci (charset = gbk)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GBK_GBK_SIMPLIFIED_CHINESE_MOST_SUITABLE_COLLATION_GBK_CHINESE_CI="gbk - GBK Simplified Chinese (most suitable collation = gbk_chinese_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GBTWO_THOUSAND_THREE_HUNDRED_AND_TWELVE_BIN_CHARSET_GBTWO_THOUSAND_THREE_HUNDRED_AND_TWELVE="gb2312_bin (charset = gb2312)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GBTWO_THOUSAND_THREE_HUNDRED_AND_TWELVE_CHINESE_CI_CHARSET_GBTWO_THOUSAND_THREE_HUNDRED_AND_TWELVE="gb2312_chinese_ci (charset = gb2312)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GBTWO_THOUSAND_THREE_HUNDRED_AND_TWELVE_GBTWO_THOUSAND_THREE_HUNDRED_AND_TWELVE_SIMPLIFIED_CHINESE_MOST_SUITABLE_COLLATION_GBTWO_THOUSAND_THREE_HUNDRED_AND_TWELVE_CHINESE_CI="gb2312 - GB2312 Simplified Chinese (most suitable collation = gb2312_chinese_ci)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_GENERIC="Generic"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GEOSTDEIGHT_BIN_CHARSET_GEOSTDEIGHT="geostd8_bin (charset = geostd8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GEOSTDEIGHT_GENERAL_CI_CHARSET_GEOSTDEIGHT="geostd8_general_ci (charset = geostd8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GEOSTDEIGHT_GEOSTDEIGHT_GEORGIAN_MOST_SUITABLE_COLLATION_GEOSTDEIGHT_GENERAL_CI="geostd8 - GEOSTD8 Georgian (most suitable collation = geostd8_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GLOBAL_DEFAULT_MYISAM="Global (default = MyISAM)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GLOBAL_DEFAULT_UTFEIGHT="Global (default = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GLOBAL_DEFAULT_UTFEIGHT_GENERAL_CI="Global (default = utf8_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GREEK_BIN_CHARSET_GREEK="greek_bin (charset = greek)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GREEK_GENERAL_CI_CHARSET_GREEK="greek_general_ci (charset = greek)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GREEK_ISO_EIGHT_THOUSAND_EIGHT_HUNDRED_AND_FIFTY_NINESEVEN_GREEK_MOST_SUITABLE_COLLATION_GREEK_GENERAL_CI="greek - ISO 8859-7 Greek (most suitable collation = greek_general_ci)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_GRID="Grid"
 COM_COMPONENTBUILDER_ADMIN_VIEW_GRID_TWO="Grid 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_HEALTH="Health"
 COM_COMPONENTBUILDER_ADMIN_VIEW_HEART="Heart"
 COM_COMPONENTBUILDER_ADMIN_VIEW_HEART_TWO="Heart 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_HEBREW_BIN_CHARSET_HEBREW="hebrew_bin (charset = hebrew)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_HEBREW_GENERAL_CI_CHARSET_HEBREW="hebrew_general_ci (charset = hebrew)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_HEBREW_ISO_EIGHT_THOUSAND_EIGHT_HUNDRED_AND_FIFTY_NINEEIGHT_HEBREW_MOST_SUITABLE_COLLATION_HEBREW_GENERAL_CI="hebrew - ISO 8859-8 Hebrew (most suitable collation = hebrew_general_ci)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_HOME="Home"
 COM_COMPONENTBUILDER_ADMIN_VIEW_HOME_TWO="Home 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_HPEIGHT_BIN_CHARSET_HPEIGHT="hp8_bin (charset = hp8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_HPEIGHT_ENGLISH_CI_CHARSET_HPEIGHT="hp8_english_ci (charset = hp8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_HPEIGHT_HP_WEST_EUROPEAN_MOST_SUITABLE_COLLATION_HPEIGHT_ENGLISH_CI="hp8 - HP West European (most suitable collation = hp8_english_ci)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_HTML="HTML"
 COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW="Html Import View"
 COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_DESCRIPTION="Add your HTML & PHP here! [Use <?php echo $name; ?> for PHP]"
@@ -704,6 +780,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_IMPLEMENTATION_DESCRIPTION="Select applicable im
 COM_COMPONENTBUILDER_ADMIN_VIEW_IMPLEMENTATION_LABEL="Implementation"
 COM_COMPONENTBUILDER_ADMIN_VIEW_INFO="Info"
 COM_COMPONENTBUILDER_ADMIN_VIEW_INFO_CIRCLE="Info Circle"
+COM_COMPONENTBUILDER_ADMIN_VIEW_INNODB="InnoDB"
 COM_COMPONENTBUILDER_ADMIN_VIEW_INPUT_DEFAULT_DESCRIPTION="Enter default input value"
 COM_COMPONENTBUILDER_ADMIN_VIEW_INPUT_DEFAULT_HINT="Default Value Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_INPUT_DEFAULT_LABEL="Default"
@@ -728,18 +805,57 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION="Add JavaScri
 COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_LABEL="Javascript (edit view footer)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_JOOMLA="Joomla"
 COM_COMPONENTBUILDER_ADMIN_VIEW_KEY="Key"
+COM_COMPONENTBUILDER_ADMIN_VIEW_KEYBCSTWO_BIN_CHARSET_KEYBCSTWO="keybcs2_bin (charset = keybcs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_KEYBCSTWO_DOS_KAMENICKY_CZECHSLOVAK_MOST_SUITABLE_COLLATION_KEYBCSTWO_GENERAL_CI="keybcs2 - DOS Kamenicky Czech-Slovak (most suitable collation = keybcs2_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_KEYBCSTWO_GENERAL_CI_CHARSET_KEYBCSTWO="keybcs2_general_ci (charset = keybcs2)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_DESCRIPTION="The key to use to link the child view."
 COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_HINT="country"
 COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_LABEL="Child Key"
 COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_MESSAGE="Error! Please add key here."
+COM_COMPONENTBUILDER_ADMIN_VIEW_KOIEIGHTR_BIN_CHARSET_KOIEIGHTR="koi8r_bin (charset = koi8r)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_KOIEIGHTR_GENERAL_CI_CHARSET_KOIEIGHTR="koi8r_general_ci (charset = koi8r)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_KOIEIGHTR_KOIEIGHTR_RELCOM_RUSSIAN_MOST_SUITABLE_COLLATION_KOIEIGHTR_GENERAL_CI="koi8r - KOI8-R Relcom Russian (most suitable collation = koi8r_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_KOIEIGHTU_BIN_CHARSET_KOIEIGHTU="koi8u_bin (charset = koi8u)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_KOIEIGHTU_GENERAL_CI_CHARSET_KOIEIGHTU="koi8u_general_ci (charset = koi8u)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_KOIEIGHTU_KOIEIGHTU_UKRAINIAN_MOST_SUITABLE_COLLATION_KOIEIGHTU_GENERAL_CI="koi8u - KOI8-U Ukrainian (most suitable collation = koi8u_general_ci)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_LAMP="Lamp"
 COM_COMPONENTBUILDER_ADMIN_VIEW_LAST="Last"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINFIVE_BIN_CHARSET_LATINFIVE="latin5_bin (charset = latin5)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINFIVE_ISO_EIGHTY_EIGHTFIVENINENINE_TURKISH_MOST_SUITABLE_COLLATION_LATINFIVE_TURKISH_CI="latin5 - ISO 8859-9 Turkish (most suitable collation = latin5_turkish_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINFIVE_TURKISH_CI_CHARSET_LATINFIVE="latin5_turkish_ci (charset = latin5)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINONE_BIN_CHARSET_LATINONE="latin1_bin (charset = latin1)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINONE_CPONETWO_HUNDRED_AND_FIFTY_TWO_WEST_EUROPEAN_MOST_SUITABLE_COLLATION_LATINONE_SWEDISH_CI="latin1 - cp1252 West European (most suitable collation = latin1_swedish_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINONE_DANISH_CI_CHARSET_LATINONE="latin1_danish_ci (charset = latin1)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINONE_GENERAL_CI_CHARSET_LATINONE="latin1_general_ci (charset = latin1)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINONE_GENERAL_CS_CHARSET_LATINONE="latin1_general_cs (charset = latin1)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINONE_GERMANONE_CI_CHARSET_LATINONE="latin1_german1_ci (charset = latin1)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINONE_GERMANTWO_CI_CHARSET_LATINONE="latin1_german2_ci (charset = latin1)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINONE_SPANISH_CI_CHARSET_LATINONE="latin1_spanish_ci (charset = latin1)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINONE_SWEDISH_CI_CHARSET_LATINONE="latin1_swedish_ci (charset = latin1)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINSEVEN_BIN_CHARSET_LATINSEVEN="latin7_bin (charset = latin7)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINSEVEN_ESTONIAN_CS_CHARSET_LATINSEVEN="latin7_estonian_cs (charset = latin7)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINSEVEN_GENERAL_CI_CHARSET_LATINSEVEN="latin7_general_ci (charset = latin7)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINSEVEN_GENERAL_CS_CHARSET_LATINSEVEN="latin7_general_cs (charset = latin7)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINSEVEN_ISO_EIGHT_THOUSAND_EIGHT_HUNDRED_AND_FIFTY_NINETHIRTEEN_BALTIC_MOST_SUITABLE_COLLATION_LATINSEVEN_GENERAL_CI="latin7 - ISO 8859-13 Baltic (most suitable collation = latin7_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINTWO_BIN_CHARSET_LATINTWO="latin2_bin (charset = latin2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINTWO_CROATIAN_CI_CHARSET_LATINTWO="latin2_croatian_ci (charset = latin2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINTWO_CZECH_CS_CHARSET_LATINTWO="latin2_czech_cs (charset = latin2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINTWO_GENERAL_CI_CHARSET_LATINTWO="latin2_general_ci (charset = latin2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINTWO_HUNGARIAN_CI_CHARSET_LATINTWO="latin2_hungarian_ci (charset = latin2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LATINTWO_ISO_EIGHT_THOUSAND_EIGHT_HUNDRED_AND_FIFTY_NINETWO_CENTRAL_EUROPEAN_MOST_SUITABLE_COLLATION_LATINTWO_GENERAL_CI="latin2 - ISO 8859-2 Central European (most suitable collation = latin2_general_ci)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_LINK="Link"
 COM_COMPONENTBUILDER_ADMIN_VIEW_LIST="List"
 COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_TWO="List 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_LOCATION="Location"
 COM_COMPONENTBUILDER_ADMIN_VIEW_LOCK="Lock"
 COM_COMPONENTBUILDER_ADMIN_VIEW_LOOP="Loop"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MACCE_BIN_CHARSET_MACCE="macce_bin (charset = macce)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MACCE_GENERAL_CI_CHARSET_MACCE="macce_general_ci (charset = macce)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MACCE_MAC_CENTRAL_EUROPEAN_MOST_SUITABLE_COLLATION_MACCE_GENERAL_CI="macce - Mac Central European (most suitable collation = macce_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MACROMAN_BIN_CHARSET_MACROMAN="macroman_bin (charset = macroman)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MACROMAN_GENERAL_CI_CHARSET_MACROMAN="macroman_general_ci (charset = macroman)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MACROMAN_MAC_WEST_EUROPEAN_MOST_SUITABLE_COLLATION_MACROMAN_GENERAL_CI="macroman - Mac West European (most suitable collation = macroman_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MEMORY="MEMORY"
 COM_COMPONENTBUILDER_ADMIN_VIEW_MENU="Menu"
 COM_COMPONENTBUILDER_ADMIN_VIEW_MENU_THREE="Menu 3"
 COM_COMPONENTBUILDER_ADMIN_VIEW_MENU_TWO="Menu 2"
@@ -760,7 +876,17 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_DATE_DESC="The date this Admin View was
 COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_ADMIN_VIEW_MOVE="Move"
 COM_COMPONENTBUILDER_ADMIN_VIEW_MUSIC="Music"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MYISAM="MyISAM"
 COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL="MySQL"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_CHARSET="Mysql Table Charset"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_CHARSET_DESCRIPTION="Select the mySql Table Charset you would like to use for this admin view's table."
+COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_CHARSET_LABEL="mySql Table Charset"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_COLLATE="Mysql Table Collate"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_COLLATE_DESCRIPTION="Select the mySql Table Collation you would like to use for this admin view's table."
+COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_COLLATE_LABEL="mySql Table Collation"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_ENGINE="Mysql Table Engine"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_ENGINE_DESCRIPTION="Select the mySql Table Engine you would like to use for this admin view's table."
+COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_ENGINE_LABEL="mySql Table Engines"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_HINT="Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LABEL="Name"
@@ -829,6 +955,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PAUSE="Pause"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PAUSE_CIRCLE="Pause Circle"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PENCIL="Pencil"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PENCIL_TWO="Pencil 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PERFORMANCE_SCHEMA="PERFORMANCE_SCHEMA"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHONE="Phone"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHONE_TWO="Phone 2"
@@ -946,6 +1073,8 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY="readonly"
 COM_COMPONENTBUILDER_ADMIN_VIEW_READWRITE="read/write"
 COM_COMPONENTBUILDER_ADMIN_VIEW_REMOVE="Remove"
 COM_COMPONENTBUILDER_ADMIN_VIEW_REPLY="Reply"
+COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS="Admin View Run Expansion Button Access"
+COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_ADMIN_VIEW_SAVE_COPY="Save Copy"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SAVE_NEW="Save New"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Admin View to customise the alias."
@@ -966,6 +1095,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_MESSAGE="Error! Please add som
 COM_COMPONENTBUILDER_ADMIN_VIEW_SHUFFLE="Shuffle"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SIGNUP="Signup"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SINGLE="Single"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SJIS_BIN_CHARSET_SJIS="sjis_bin (charset = sjis)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SJIS_JAPANESE_CI_CHARSET_SJIS="sjis_japanese_ci (charset = sjis)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SJIS_SHIFTJIS_JAPANESE_MOST_SUITABLE_COLLATION_SJIS_JAPANESE_CI="sjis - Shift-JIS Japanese (most suitable collation = sjis_japanese_ci)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY="Smiley"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY_NEUTRAL="Smiley Neutral"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY_NEUTRAL_TWO="Smiley Neutral 2"
@@ -989,6 +1121,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_STOP="Stop"
 COM_COMPONENTBUILDER_ADMIN_VIEW_STOP_CIRCLE="Stop Circle"
 COM_COMPONENTBUILDER_ADMIN_VIEW_STRING="STRING"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SUPPORT="Support"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SWESEVEN_BIN_CHARSET_SWESEVEN="swe7_bin (charset = swe7)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SWESEVEN_SEVENBIT_SWEDISH_MOST_SUITABLE_COLLATION_SWESEVEN_SWEDISH_CI="swe7 - 7bit Swedish (most suitable collation = swe7_swedish_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SWESEVEN_SWEDISH_CI_CHARSET_SWESEVEN="swe7_swedish_ci (charset = swe7)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SWITCH="Switch"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME="System Name"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME_DESCRIPTION="Used only in the system."
@@ -1012,12 +1147,46 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_TASK_NAME_LABEL="Task Name"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TASK_NAME_MESSAGE="Error! Please add task name here."
 COM_COMPONENTBUILDER_ADMIN_VIEW_THUMBS_DOWN="Thumbs Down"
 COM_COMPONENTBUILDER_ADMIN_VIEW_THUMBS_UP="Thumbs Up"
+COM_COMPONENTBUILDER_ADMIN_VIEW_TISSIX_HUNDRED_AND_TWENTY_BIN_CHARSET_TISSIX_HUNDRED_AND_TWENTY="tis620_bin (charset = tis620)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_TISSIX_HUNDRED_AND_TWENTY_THAI_CI_CHARSET_TISSIX_HUNDRED_AND_TWENTY="tis620_thai_ci (charset = tis620)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_TISSIX_HUNDRED_AND_TWENTY_TISSIX_HUNDRED_AND_TWENTY_THAI_MOST_SUITABLE_COLLATION_TISSIX_HUNDRED_AND_TWENTY_THAI_CI="tis620 - TIS620 Thai (most suitable collation = tis620_thai_ci)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TREE="Tree"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TREE_TWO="Tree 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE="Type"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_DESCRIPTION="for list target"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL="Type"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_BIN_CHARSET_UCSTWO="ucs2_bin (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_CROATIAN_CI_CHARSET_UCSTWO="ucs2_croatian_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_CZECH_CI_CHARSET_UCSTWO="ucs2_czech_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_DANISH_CI_CHARSET_UCSTWO="ucs2_danish_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_ESPERANTO_CI_CHARSET_UCSTWO="ucs2_esperanto_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_ESTONIAN_CI_CHARSET_UCSTWO="ucs2_estonian_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_GENERAL_CI_CHARSET_UCSTWO="ucs2_general_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_GENERAL_MYSQLFIVE_HUNDRED_CI_CHARSET_UCSTWO="ucs2_general_mysql500_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_GERMANTWO_CI_CHARSET_UCSTWO="ucs2_german2_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_HUNGARIAN_CI_CHARSET_UCSTWO="ucs2_hungarian_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_ICELANDIC_CI_CHARSET_UCSTWO="ucs2_icelandic_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_LATVIAN_CI_CHARSET_UCSTWO="ucs2_latvian_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_LITHUANIAN_CI_CHARSET_UCSTWO="ucs2_lithuanian_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_PERSIAN_CI_CHARSET_UCSTWO="ucs2_persian_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_POLISH_CI_CHARSET_UCSTWO="ucs2_polish_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_ROMANIAN_CI_CHARSET_UCSTWO="ucs2_romanian_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_ROMAN_CI_CHARSET_UCSTWO="ucs2_roman_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_SINHALA_CI_CHARSET_UCSTWO="ucs2_sinhala_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_SLOVAK_CI_CHARSET_UCSTWO="ucs2_slovak_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_SLOVENIAN_CI_CHARSET_UCSTWO="ucs2_slovenian_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_SPANISHTWO_CI_CHARSET_UCSTWO="ucs2_spanish2_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_SPANISH_CI_CHARSET_UCSTWO="ucs2_spanish_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_SWEDISH_CI_CHARSET_UCSTWO="ucs2_swedish_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_TURKISH_CI_CHARSET_UCSTWO="ucs2_turkish_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_UCSTWO_UNICODE_MOST_SUITABLE_COLLATION_UCSTWO_GENERAL_CI="ucs2 - UCS-2 Unicode (most suitable collation = ucs2_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_UNICODE_CI_CHARSET_UCSTWO="ucs2_unicode_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_UNICODE_FIVETWOZERO_CI_CHARSET_UCSTWO="ucs2_unicode_520_ci (charset = ucs2)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_VIETNAMESE_CI_CHARSET_UCSTWO="ucs2_vietnamese_ci (charset = ucs2)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_UINT="UINT"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UJIS_BIN_CHARSET_UJIS="ujis_bin (charset = ujis)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UJIS_EUCJP_JAPANESE_MOST_SUITABLE_COLLATION_UJIS_JAPANESE_CI="ujis - EUC-JP Japanese (most suitable collation = ujis_japanese_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UJIS_JAPANESE_CI_CHARSET_UJIS="ujis_japanese_ci (charset = ujis)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_UNARCHIVE="Unarchive"
 COM_COMPONENTBUILDER_ADMIN_VIEW_UNBLOCK="Unblock"
 COM_COMPONENTBUILDER_ADMIN_VIEW_UNDO="Undo"
@@ -1032,6 +1201,118 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_USERNAME="USERNAME"
 COM_COMPONENTBUILDER_ADMIN_VIEW_USERS="Users"
 COM_COMPONENTBUILDER_ADMIN_VIEW_USER_CHECK_DESCRIPTION="Allow only users."
 COM_COMPONENTBUILDER_ADMIN_VIEW_USER_CHECK_LABEL="User Check"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_BIN_CHARSET_UTFEIGHTMBFOUR="utf8mb4_bin (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_CROATIAN_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_croatian_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_CZECH_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_czech_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_DANISH_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_danish_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_ESPERANTO_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_esperanto_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_ESTONIAN_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_estonian_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_GENERAL_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_general_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_GERMANTWO_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_german2_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_HUNGARIAN_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_hungarian_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_ICELANDIC_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_icelandic_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_LATVIAN_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_latvian_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_LITHUANIAN_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_lithuanian_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_PERSIAN_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_persian_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_POLISH_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_polish_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_ROMANIAN_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_romanian_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_ROMAN_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_roman_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_SINHALA_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_sinhala_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_SLOVAK_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_slovak_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_SLOVENIAN_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_slovenian_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_SPANISHTWO_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_spanish2_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_SPANISH_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_spanish_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_SWEDISH_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_swedish_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_TURKISH_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_turkish_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_UNICODE_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_unicode_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_UNICODE_FIVE_HUNDRED_AND_TWENTY_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_unicode_520_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_UTFEIGHT_UNICODE_MOST_SUITABLE_COLLATION_UTFEIGHTMBFOUR_GENERAL_CI="utf8mb4 - UTF-8 Unicode (most suitable collation = utf8mb4_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHTMBFOUR_VIETNAMESE_CI_CHARSET_UTFEIGHTMBFOUR="utf8mb4_vietnamese_ci (charset = utf8mb4)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_BIN_CHARSET_UTFEIGHT="utf8_bin (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_CROATIAN_CI_CHARSET_UTFEIGHT="utf8_croatian_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_CZECH_CI_CHARSET_UTFEIGHT="utf8_czech_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_DANISH_CI_CHARSET_UTFEIGHT="utf8_danish_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_ESPERANTO_CI_CHARSET_UTFEIGHT="utf8_esperanto_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_ESTONIAN_CI_CHARSET_UTFEIGHT="utf8_estonian_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_GENERAL_CI_CHARSET_UTFEIGHT="utf8_general_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_GENERAL_MYSQLFIVE_HUNDRED_CI_CHARSET_UTFEIGHT="utf8_general_mysql500_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_GERMANTWO_CI_CHARSET_UTFEIGHT="utf8_german2_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_HUNGARIAN_CI_CHARSET_UTFEIGHT="utf8_hungarian_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_ICELANDIC_CI_CHARSET_UTFEIGHT="utf8_icelandic_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_LATVIAN_CI_CHARSET_UTFEIGHT="utf8_latvian_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_LITHUANIAN_CI_CHARSET_UTFEIGHT="utf8_lithuanian_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_PERSIAN_CI_CHARSET_UTFEIGHT="utf8_persian_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_POLISH_CI_CHARSET_UTFEIGHT="utf8_polish_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_ROMANIAN_CI_CHARSET_UTFEIGHT="utf8_romanian_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_ROMAN_CI_CHARSET_UTFEIGHT="utf8_roman_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_SINHALA_CI_CHARSET_UTFEIGHT="utf8_sinhala_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_SLOVAK_CI_CHARSET_UTFEIGHT="utf8_slovak_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_SLOVENIAN_CI_CHARSET_UTFEIGHT="utf8_slovenian_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_SPANISHTWO_CI_CHARSET_UTFEIGHT="utf8_spanish2_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_SPANISH_CI_CHARSET_UTFEIGHT="utf8_spanish_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_SWEDISH_CI_CHARSET_UTFEIGHT="utf8_swedish_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_TURKISH_CI_CHARSET_UTFEIGHT="utf8_turkish_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_UNICODE_CI_CHARSET_UTFEIGHT="utf8_unicode_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_UNICODE_FIVE_HUNDRED_AND_TWENTY_CI_CHARSET_UTFEIGHT="utf8_unicode_520_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_UTFEIGHT_UNICODE_MOST_SUITABLE_COLLATION_UTFEIGHT_GENERAL_CI="utf8 - UTF-8 Unicode (most suitable collation = utf8_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFEIGHT_VIETNAMESE_CI_CHARSET_UTFEIGHT="utf8_vietnamese_ci (charset = utf8)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEENLE_BIN_CHARSET_UTFSIXTEENLE="utf16le_bin (charset = utf16le)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEENLE_GENERAL_CI_CHARSET_UTFSIXTEENLE="utf16le_general_ci (charset = utf16le)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEENLE_UTFSIXTEENLE_UNICODE_MOST_SUITABLE_COLLATION_UTFSIXTEENLE_GENERAL_CI="utf16le - UTF-16LE Unicode (most suitable collation = utf16le_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_BIN_CHARSET_UTFSIXTEEN="utf16_bin (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_CROATIAN_CI_CHARSET_UTFSIXTEEN="utf16_croatian_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_CZECH_CI_CHARSET_UTFSIXTEEN="utf16_czech_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_DANISH_CI_CHARSET_UTFSIXTEEN="utf16_danish_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_ESPERANTO_CI_CHARSET_UTFSIXTEEN="utf16_esperanto_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_ESTONIAN_CI_CHARSET_UTFSIXTEEN="utf16_estonian_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_GENERAL_CI_CHARSET_UTFSIXTEEN="utf16_general_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_GERMANTWO_CI_CHARSET_UTFSIXTEEN="utf16_german2_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_HUNGARIAN_CI_CHARSET_UTFSIXTEEN="utf16_hungarian_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_ICELANDIC_CI_CHARSET_UTFSIXTEEN="utf16_icelandic_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_LATVIAN_CI_CHARSET_UTFSIXTEEN="utf16_latvian_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_LITHUANIAN_CI_CHARSET_UTFSIXTEEN="utf16_lithuanian_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_PERSIAN_CI_CHARSET_UTFSIXTEEN="utf16_persian_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_POLISH_CI_CHARSET_UTFSIXTEEN="utf16_polish_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_ROMANIAN_CI_CHARSET_UTFSIXTEEN="utf16_romanian_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_ROMAN_CI_CHARSET_UTFSIXTEEN="utf16_roman_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_SINHALA_CI_CHARSET_UTFSIXTEEN="utf16_sinhala_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_SLOVAK_CI_CHARSET_UTFSIXTEEN="utf16_slovak_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_SLOVENIAN_CI_CHARSET_UTFSIXTEEN="utf16_slovenian_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_SPANISHTWO_CI_CHARSET_UTFSIXTEEN="utf16_spanish2_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_SPANISH_CI_CHARSET_UTFSIXTEEN="utf16_spanish_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_SWEDISH_CI_CHARSET_UTFSIXTEEN="utf16_swedish_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_TURKISH_CI_CHARSET_UTFSIXTEEN="utf16_turkish_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_UNICODE_CI_CHARSET_UTFSIXTEEN="utf16_unicode_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_UNICODE_FIVE_HUNDRED_AND_TWENTY_CI_CHARSET_UTFSIXTEEN="utf16_unicode_520_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_UTFSIXTEEN_UNICODE_MOST_SUITABLE_COLLATION_UTFSIXTEEN_GENERAL_CI="utf16 - UTF-16 Unicode (most suitable collation = utf16_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFSIXTEEN_VIETNAMESE_CI_CHARSET_UTFSIXTEEN="utf16_vietnamese_ci (charset = utf16)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_BIN_CHARSET_UTFTHIRTY_TWO="utf32_bin (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_CROATIAN_CI_CHARSET_UTFTHIRTY_TWO="utf32_croatian_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_CZECH_CI_CHARSET_UTFTHIRTY_TWO="utf32_czech_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_DANISH_CI_CHARSET_UTFTHIRTY_TWO="utf32_danish_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_ESPERANTO_CI_CHARSET_UTFTHIRTY_TWO="utf32_esperanto_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_ESTONIAN_CI_CHARSET_UTFTHIRTY_TWO="utf32_estonian_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_GENERAL_CI_CHARSET_UTFTHIRTY_TWO="utf32_general_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_GERMANTWO_CI_CHARSET_UTFTHIRTY_TWO="utf32_german2_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_HUNGARIAN_CI_CHARSET_UTFTHIRTY_TWO="utf32_hungarian_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_ICELANDIC_CI_CHARSET_UTFTHIRTY_TWO="utf32_icelandic_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_LATVIAN_CI_CHARSET_UTFTHIRTY_TWO="utf32_latvian_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_LITHUANIAN_CI_CHARSET_UTFTHIRTY_TWO="utf32_lithuanian_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_PERSIAN_CI_CHARSET_UTFTHIRTY_TWO="utf32_persian_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_POLISH_CI_CHARSET_UTFTHIRTY_TWO="utf32_polish_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_ROMANIAN_CI_CHARSET_UTFTHIRTY_TWO="utf32_romanian_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_ROMAN_CI_CHARSET_UTFTHIRTY_TWO="utf32_roman_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_SINHALA_CI_CHARSET_UTFTHIRTY_TWO="utf32_sinhala_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_SLOVAK_CI_CHARSET_UTFTHIRTY_TWO="utf32_slovak_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_SLOVENIAN_CI_CHARSET_UTFTHIRTY_TWO="utf32_slovenian_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_SPANISHTWO_CI_CHARSET_UTFTHIRTY_TWO="utf32_spanish2_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_SPANISH_CI_CHARSET_UTFTHIRTY_TWO="utf32_spanish_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_SWEDISH_CI_CHARSET_UTFTHIRTY_TWO="utf32_swedish_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_TURKISH_CI_CHARSET_UTFTHIRTY_TWO="utf32_turkish_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_UNICODE_CI_CHARSET_UTFTHIRTY_TWO="utf32_unicode_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_UNICODE_FIVE_HUNDRED_AND_TWENTY_CI_CHARSET_UTFTHIRTY_TWO="utf32_unicode_520_ci (charset = utf32)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_UTFTHIRTY_TWO_UNICODE_MOST_SUITABLE_COLLATION_UTFTHIRTY_TWO_GENERAL_CI="utf32 - UTF-32 Unicode (most suitable collation = utf32_general_ci)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UTFTHIRTY_TWO_VIETNAMESE_CI_CHARSET_UTFTHIRTY_TWO="utf32_vietnamese_ci (charset = utf32)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_VALUE_NAME_DESCRIPTION="Enter Value Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_VALUE_NAME_HINT="Value Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_VALUE_NAME_LABEL="Value Name"
@@ -1113,6 +1394,8 @@ COM_COMPONENTBUILDER_BSB_COULD_NOT_BE_IMPORTEDS="<b>%s</b> could not be imported
 COM_COMPONENTBUILDER_BSB_HAS_BEEN_IMPORTED="<b>%s</b> has been imported!"
 COM_COMPONENTBUILDER_BSB_HAS_BEEN_UPDATED="<b>%s</b> has been updated!"
 COM_COMPONENTBUILDER_BSB_WAS_FOUND="<b>%s</b> was found!"
+COM_COMPONENTBUILDER_BTHE_EXPANSION_WAS_SUCCESSFULLYB_TO_SEE_MORE_INFORMATION_CHANGE_THE_BRETURN_OPTIONS_FOR_BUILDB_TO_BDISPLAY_MESSAGEB_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TABB="<b>The expansion was successfully!</b> to see more information change the <b>Return Options for Build</b> to <b>Display Message</b> in the global options of JCB under the Development Method tab.</b>"
+COM_COMPONENTBUILDER_BTHE_TMP_FOLDER_HAS_BEEN_CLEAR_SUCCESSFULLYB="<b>The tmp folder has been clear successfully!</b>"
 COM_COMPONENTBUILDER_BUILD="Build"
 COM_COMPONENTBUILDER_BUILDIN="Build-in"
 COM_COMPONENTBUILDER_BULK="Bulk"
@@ -1143,6 +1426,8 @@ COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS_DESC=" Allows the users in
 COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST="Compiler Dashboard List"
 COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Compiler"
 COM_COMPONENTBUILDER_COMPILER_DESC="The compiler"
+COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS="Compiler Run Expansion Button Access"
+COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_COMPILER_SUBMENU="Compiler Submenu"
 COM_COMPONENTBUILDER_COMPILER_SUBMENU_DESC="Allows the users in this group to submenu of Compiler"
 COM_COMPONENTBUILDER_COMPILE_COMPONENT="Compile Component"
@@ -2653,9 +2938,18 @@ COM_COMPONENTBUILDER_CONFIG_NOTE_COMPILER_FOLDER_PATH_DESCRIPTION="The compiler
 COM_COMPONENTBUILDER_CONFIG_NOTE_COMPILER_FOLDER_PATH_LABEL="Moving The Compiler Folder"
 COM_COMPONENTBUILDER_CONFIG_NOTE_CUSTOM_FOLDER_PATH_DESCRIPTION="The custom folder is where all files and folders that you would like to include in your components are stored, the default location is [administrator/components/com_componentbuilder/custom]. You can move this folder by adding your own path here. Remember to move the content of the default custom folder to this new location."
 COM_COMPONENTBUILDER_CONFIG_NOTE_CUSTOM_FOLDER_PATH_LABEL="Moving The Custom Folder"
-COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_DEFAULT_DESCRIPTION="<p>This method is basically the way JCB has always worked by default.</p><p>You have a compiler area, once you have made changes you go to the compiler view and compile your component. Then you have the option to install and/or distribute the Joomla install package.</p><p>This can also be called the manual development method.</p>"
+COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_DEFAULT_DESCRIPTION="<p>This method is basically the way JCB has always worked by default.</p>
+<p>So once you have made changes, you go to the compiler view and compile your component. Then you have the option to install and/or distribute the Joomla installation package.</p><p>This option will always be active to those with permission to access the compiler. You can change this permission in the Permissions tab with the option called <b>Compiler Access</b>.</p>"
 COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_DEFAULT_LABEL="Default Development Method"
-COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_EXPANSION_DESCRIPTION="<p>This method adds auto expansion to the current Joomla automatically.</p><p>Below you setup the behaviour of a selected set of components that will be <b>auto build and installed</b>. So you do not need to manually compile and install those components any more, the system does all that automatically for you.</p><p>So your experience is that you change the field, view or something else in JCB and then the component in Joomla moments later reflect those changed automatically. The latency of the workflow is based on your <b>cronjob frequency</b> and the <b>size</b> of your component. You can pause the build in a few ways, one by actually <b>checking out/opening</b> the Joomla Component view of the component in JCB, or changing the state to unpublish, archive or trashed, or simply remove if from the list below.</p><p>This can also be called the automatic development method.</p>"
+COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_EXPANSION_DESCRIPTION="<p>This method adds easy compile and install of multiple components to the current Joomla system. This automated action is called <b>expansion</b>.</p>
+<p><em>Expansion can be achieved in two ways.</em></p>
+<h4>Button Expansion Option</h4>
+<p>The first and most common way is to click on any of the <b>Run Expansion</b> buttons found at the top of some of the JCB admin views.</p>
+<h4>Cronjob Expansion Option</h4>
+<p>The second is by running a cronjob as explained bellow the area of selection in this tab. So you do not need to manually compile and install the selected components any more, the system does all that automatically for you. The latency of the workflow is based on your <b>cronjob frequency</b> and the <b>size</b> of your component.</p>
+<p>Expansion is pause for a component in a few ways, one by actually <b>checking out/opening</b> the Joomla Component view of the component in JCB, or changing the state to unpublish, archive or trashed, or simply remove if from the list below.</p>
+<h3>The Expansion method is there to speedup development testing.</h3>
+<p>Below you should set the behaviour of a selected set of components that will be <b>auto build and installed</b> when the expansion module is run.</p>"
 COM_COMPONENTBUILDER_CONFIG_NOTE_DEVELOPMENT_METHOD_EXPANSION_LABEL="Expansion Development Method"
 COM_COMPONENTBUILDER_CONFIG_NOTE_DKIM_USE_DESCRIPTION="<p>Using the below details, you need to configure your DNS by adding a TXT record on your domain: <b><span id='a_dkim_domain'></span></b></p>
 <script>
@@ -2754,6 +3048,7 @@ COM_COMPONENTBUILDER_CONTRIBUTOR="Contributor"
 COM_COMPONENTBUILDER_CONTRIBUTORS="Contributors"
 COM_COMPONENTBUILDER_COPYRIGHT="Copyright"
 COM_COMPONENTBUILDER_COPYRIGHT_S="Copyright: %s"
+COM_COMPONENTBUILDER_COULD_NOT_CLEAR_THE_TMP_FOLDER="Could not clear the tmp folder!"
 COM_COMPONENTBUILDER_CREATE="Create"
 COM_COMPONENTBUILDER_CREATE_A_SNIPPET="create a snippet"
 COM_COMPONENTBUILDER_CREATE_NEW_S="Create New %s"
@@ -3393,22 +3688,25 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_DESCRIPTION="<div c
 <p><b><span class='placeholder-key-id'>x</span> is the ID of the code in the system don&apos;t change it when you edit the code in your IDE outside of JCB!</b></p>
 </div>
 <div class='span6' id='usedin' style='display: none;'>
+
 <h1>USED IN</h1>
 <div id='before-usedin'>Soon as enough data is available we will display all the areas where this code is used.</div>
 <div id='usedin-a' style='display: none;'><h2>Components</h2><div id='area-a'></div></div>
-<div id='usedin-b' style='display:none;'><h2>Admin Views</h2><div id='area-b'></div></div>
+<div id='usedin-b' style='display:none;'><h2>Component Dashboard</h2><div id='area-b'></div></div>
-<div id='usedin-c' style='display:none;'><h2>Custom Admin Views</h2><div id='area-c'></div></div>
+<div id='usedin-c' style='display:none;'><h2>Admin Views</h2><div id='area-c'></div></div>
-<div id='usedin-d' style='display:none;'><h2>Site Views</h2><div id='area-d'></div></div>
+<div id='usedin-d' style='display:none;'><h2>Admin Fields Relations</h2><div id='area-d'></div></div>
-<div id='usedin-e' style='display:none;'><h2>Fields</h2><div id='area-e'></div></div>
+<div id='usedin-e' style='display:none;'><h2>Custom Admin Views</h2><div id='area-e'></div></div>
-<div id='usedin-f' style='display:none;'><h2>Dynamic Gets</h2><div id='area-f'></div></div>
+<div id='usedin-f' style='display:none;'><h2>Site Views</h2><div id='area-r'></div></div>
-<div id='usedin-g' style='display:none;'><h2>Templates</h2><div id='area-g'></div></div>
+<div id='usedin-g' style='display:none;'><h2>Fields</h2><div id='area-g'></div></div>
-<div id='usedin-h' style='display:none;'><h2>Layouts</h2><div id='area-h'></div></div>
+<div id='usedin-h' style='display:none;'><h2>Fieldtypes</h2><div id='area-h'></div></div>
-<div id='usedin-i' style='display:none;'><h2>Component Dashboards</h2><div id='area-i'></div></div>
+<div id='usedin-i' style='display:none;'><h2>Dynamic Gets</h2><div id='area-i'></div></div>
-<div id='usedin-j' style='display:none;'><h2>Libraries</h2><div id='area-j'></div></div>
+<div id='usedin-j' style='display:none;'><h2>Templates</h2><div id='area-j'></div></div>
+<div id='usedin-k' style='display:none;'><h2>Layouts</h2><div id='area-k'></div></div>
+<div id='usedin-l' style='display:none;'><h2>Libraries</h2><div id='area-l'></div></div>
 <div id='loading-usedin' style='display: none;'><h2>Scanning Database<span class='loading-dots'>..</span></h2></div>
 <div id='note-usedin-found' style='display: none;'><small>You can edit the above areas where this code is used.</small></div>
 <div id='note-usedin-not' style='display: none;'><small>This code is not used in any area of the JCB custom code blocks at this time.</small></div>
-</div></div>"
+</div>"
 COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_LABEL="Information Area."
 COM_COMPONENTBUILDER_CUSTOM_CODE_NOT_REQUIRED="Not Required"
 COM_COMPONENTBUILDER_CUSTOM_CODE_ORDERING_LABEL="Ordering"
@@ -3421,6 +3719,8 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_CUSTOM_CODE_PHPJS="PHP/JS"
 COM_COMPONENTBUILDER_CUSTOM_CODE_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_CUSTOM_CODE_REPLACEMENT="Replacement"
+COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS="Custom Code Run Expansion Button Access"
+COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_CUSTOM_CODE_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Custom Code to customise the alias."
 COM_COMPONENTBUILDER_CUSTOM_CODE_STATUS="Status"
 COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME="System Name"
@@ -3745,10 +4045,13 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_DYNAMIC_GET_Q="q"
 COM_COMPONENTBUILDER_DYNAMIC_GET_QQ="qq"
 COM_COMPONENTBUILDER_DYNAMIC_GET_R="r"
+COM_COMPONENTBUILDER_DYNAMIC_GET_RANDOM="Random"
 COM_COMPONENTBUILDER_DYNAMIC_GET_REPEATABLE_VALUE="Repeatable Value"
 COM_COMPONENTBUILDER_DYNAMIC_GET_ROW_TYPE_DESCRIPTION="Single row or Multiple rows"
 COM_COMPONENTBUILDER_DYNAMIC_GET_ROW_TYPE_LABEL="Return Row Type"
 COM_COMPONENTBUILDER_DYNAMIC_GET_RR="rr"
+COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS="Dynamic Get Run Expansion Button Access"
+COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_DYNAMIC_GET_S="s"
 COM_COMPONENTBUILDER_DYNAMIC_GET_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Dynamic Get to customise the alias."
 COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_DESCRIPTION="Fields to be selected from table."
@@ -3836,6 +4139,7 @@ COM_COMPONENTBUILDER_ERROR_YOU_DO_NOT_HAVE_ACCESS_TO_THE_SNIPPETS="Error! You do
 COM_COMPONENTBUILDER_ERROR_YOU_DO_NOT_HAVE_PERMISSION_TO_CREATE_THE_SNIPPET="Error! You do not have permission to create the snippet."
 COM_COMPONENTBUILDER_EXACT_LENGTH_ONLY_FOUR_TEXT_FIELD="Exact Length (only 4 text_field)"
 COM_COMPONENTBUILDER_EXAMPLE="Example"
+COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB="Expansion failed, please check your settings in the global options of JCB under the Development Method tab!"
 COM_COMPONENTBUILDER_EXPORTIMPORT_DATA="Export/Import Data"
 COM_COMPONENTBUILDER_EXPORT_COMPLETED="Export Completed!"
 COM_COMPONENTBUILDER_EXPORT_DATA="Export Data"
@@ -3908,12 +4212,18 @@ COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_LIST="Fieldtypes Dashboard List"
 COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_DELETE="Fieldtypes Delete"
 COM_COMPONENTBUILDER_FIELDTYPES_DELETE_DESC="Allows the users in this group to delete delete fieldtypes"
-COM_COMPONENTBUILDER_FIELDTYPES_DESCRIPTION="Fieldtypes Description"
-COM_COMPONENTBUILDER_FIELDTYPES_DESCRIPTION_DESC="Allows the users in this group to description of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT="Fieldtypes Edit"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESC="Allows the users in this group to edit the fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION="Fieldtypes Edit Description"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION_DESC="Allows the users in this group to edit description of fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME="Fieldtypes Edit Name"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME_DESC="Allows the users in this group to edit name of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN="Fieldtypes Edit Own"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own fieldtypes created by them"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES="Fieldtypes Edit Properties"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES_DESC="Allows the users in this group to edit properties of fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION="Fieldtypes Edit Short Description"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION_DESC="Allows the users in this group to edit short description of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE="Fieldtypes Edit State"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE_DESC="Allows the users in this group to update the state of the fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION="Fieldtypes Edit Version"
@@ -3922,8 +4232,6 @@ COM_COMPONENTBUILDER_FIELDTYPES_EXPORT="Fieldtypes Export"
 COM_COMPONENTBUILDER_FIELDTYPES_EXPORT_DESC="Allows the users in this group to export export fieldtypes"
 COM_COMPONENTBUILDER_FIELDTYPES_IMPORT="Fieldtypes Import"
 COM_COMPONENTBUILDER_FIELDTYPES_IMPORT_DESC="Allows the users in this group to import import fieldtypes"
-COM_COMPONENTBUILDER_FIELDTYPES_NAME="Fieldtypes Name"
-COM_COMPONENTBUILDER_FIELDTYPES_NAME_DESC="Allows the users in this group to name of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_N_ITEMS_ARCHIVED="%s Fieldtypes archived."
 COM_COMPONENTBUILDER_FIELDTYPES_N_ITEMS_ARCHIVED_1="%s Fieldtype archived."
 COM_COMPONENTBUILDER_FIELDTYPES_N_ITEMS_CHECKED_IN_0="No Fieldtype successfully checked in."
@@ -3941,10 +4249,6 @@ COM_COMPONENTBUILDER_FIELDTYPES_N_ITEMS_UNFEATURED="%s Fieldtypes unfeatured."
 COM_COMPONENTBUILDER_FIELDTYPES_N_ITEMS_UNFEATURED_1="%s Fieldtype unfeatured."
 COM_COMPONENTBUILDER_FIELDTYPES_N_ITEMS_UNPUBLISHED="%s Fieldtypes unpublished."
 COM_COMPONENTBUILDER_FIELDTYPES_N_ITEMS_UNPUBLISHED_1="%s Fieldtype unpublished."
-COM_COMPONENTBUILDER_FIELDTYPES_PROPERTIES="Fieldtypes Properties"
-COM_COMPONENTBUILDER_FIELDTYPES_PROPERTIES_DESC="Allows the users in this group to properties of fieldtype"
-COM_COMPONENTBUILDER_FIELDTYPES_SHORT_DESCRIPTION="Fieldtypes Short Description"
-COM_COMPONENTBUILDER_FIELDTYPES_SHORT_DESCRIPTION_DESC="Allows the users in this group to short description of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU="Fieldtypes Submenu"
 COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU_DESC="Allows the users in this group to submenu of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_DESCRIPTION="Select if the value is adjustable.<br />If not the Value/Example will be enforced."
@@ -3962,6 +4266,7 @@ COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_LABEL="Description"
 COM_COMPONENTBUILDER_FIELDTYPE_DETAILS="Details"
 COM_COMPONENTBUILDER_FIELDTYPE_EDIT="Editing the Fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPE_ERROR_UNIQUE_ALIAS="Another Fieldtype has the same alias."
+COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_DESCRIPTION="Text Area"
 COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_HINT="Value/Example Here"
 COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_LABEL="Value/Example"
 COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_MESSAGE="Error! Please add value/example here."
@@ -4197,6 +4502,8 @@ COM_COMPONENTBUILDER_FIELD_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_FIELD_OTHER="Other"
 COM_COMPONENTBUILDER_FIELD_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_FIELD_PUBLISHING="Publishing"
+COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS="Field Run Expansion Button Access"
+COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_FIELD_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Field to customise the alias."
 COM_COMPONENTBUILDER_FIELD_SCRIPTS="Scripts"
 COM_COMPONENTBUILDER_FIELD_SELECT_AN_OPTION="Select an option"
@@ -4534,6 +4841,9 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_JAVASCRIPT_LABEL="Add Javascript"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_LICENSE="Add License"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_LICENSE_DESCRIPTION="Add the option to use the whmcs license add-on in the component."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_LICENSE_LABEL="Add WHMCS<br /><small>(license add-on)</small>"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_MENU_PREFIX="Add Menu Prefix"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_MENU_PREFIX_DESCRIPTION="Would you like to add a prefix to the Joomla menu name of this component"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_MENU_PREFIX_LABEL="Add Menu Prefix"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_HELPER_ADMIN="Add Php Helper Admin"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_HELPER_ADMIN_LABEL="Add PHP (helper_admin Class)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_HELPER_BOTH="Add Php Helper Both"
@@ -4586,6 +4896,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMPSQL_LABEL="MySQL"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_DESCRIPTION="To build the component fields and back-end views dynamically using a mySQL table file."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_LABEL="Build Backend-views Dynamically"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDER_BACKUP_KEY="Joomla Component Builder - Backup Key"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS="Joomla Component Clear tmp Button Access"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clear tmp button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS="Joomla Component Clone Button Access"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clone button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME="Companyname"
@@ -4683,6 +4995,12 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LICENSE_TYPE="License Type"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LICENSE_TYPE_DESCRIPTION="How should the license be implemented."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LICENSE_TYPE_LABEL="Implementation"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LOCK_DOWN_USE_USED_TO_VERIFY_OWNERSHIP="Lock Down Use (used to verify ownership)"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_MENU_PREFIX="Menu Prefix"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_MENU_PREFIX_DESCRIPTION="Add the prefix you would like to use. Make sure that it is HTML Character Entities since it is being used in XML."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_MENU_PREFIX_HINT="&#187;"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_MENU_PREFIX_LABEL="Prefix<br />
+<small><a href='https://dev.w3.org/html5/html-author/charref' target='_blank'>check this list out</a></small>"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_MENU_PREFIX_MESSAGE="Error! Please add some text here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_MODIFIED_BY_DESC="The last user that modified this Joomla Component."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_MODIFIED_BY_LABEL="Modified By"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_MODIFIED_DATE_DESC="The date this Joomla Component was modified."
@@ -4837,6 +5155,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_SITE_EVENT_LABEL="Global Helper Site E
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README="Readme"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README_LABEL="README.md"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS="Joomla Component Run Expansion Button Access"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER="Sales Server"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_DESCRIPTION="Select your sales server for this component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_LABEL="Sales Server"
@@ -4888,6 +5208,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_URL_HINT="http://www.example
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_URL_LABEL="Update Server"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_URL_MESSAGE="Error! Please add url here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_USE_DESCRIPTION="How should we link to this contributor."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_USE_GLOBAL="Use Global"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_USE_GLOBAL_VERSION="Use Global Version"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_USE_LABEL="Use"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_USE_ONLY_FIRST_NUMBER_OF_GLOBAL_VERSION_ONEXX="Use Only First Number of Global Version (1.x.x)"
@@ -5694,6 +6015,7 @@ COM_COMPONENTBUILDER_REVERT_ALL_AHEAD_SNIPPETS="Revert All Ahead Snippets"
 COM_COMPONENTBUILDER_REVIEW_THIS_ISSUE_ON_GITHUB="Review this issue on Github"
 COM_COMPONENTBUILDER_RIGHT_IN_TAB="Right in Tab"
 COM_COMPONENTBUILDER_RIGHT_OF_TABS="Right of Tabs"
+COM_COMPONENTBUILDER_RUN_EXPANSION="Run Expansion"
 COM_COMPONENTBUILDER_SAVE_SUCCESS="Great! Item successfully saved."
 COM_COMPONENTBUILDER_SAVE_WARNING="The value already existed so please select another."
 COM_COMPONENTBUILDER_SBR_YOU_CAN_ADD_AN_BACCESS_TOKENB_TO_GETBIBLE_GLOBAL_OPTIONS_TO_MAKE_AUTHENTICATED_REQUESTS_AN_ACCESS_TOKEN_WITH_ONLY_PUBLIC_ACCESS_WILL_DO="%s<br />You can add an <b>access token<b/> to getBible global options to make authenticated requests. An access token with only public access will do."
@@ -6726,8 +7048,8 @@ COM_COMPONENTBUILDER_THE_SEARCH_FOR_THE_SNIPPETS_ARE_CASE_SENSITIVE_SO_IF_YOU_CH
 COM_COMPONENTBUILDER_THE_SERVER_DETAILS_FOR_BID_SB_COULD_NOT_BE_RETRIEVED="The server details for <b>(ID: %s)</b> could not be retrieved!"
 COM_COMPONENTBUILDER_THE_SNIPPETS_WERE_SUCCESSFULLY_EXPORTED="The Snippets Were Successfully Exported!"
 COM_COMPONENTBUILDER_THE_SNIPPET_WAS_SUCCESSFULLY_EXPORTED="The Snippet Was Successfully Exported!"
+COM_COMPONENTBUILDER_THE_TEXT_IS_LOADING="The text is loading"
 COM_COMPONENTBUILDER_THE_URL_S_SET_TO_RETRIEVE_THE_PACKAGES_DOES_NOT_EXIST="The url (%s) set to retrieve the packages does not exist!"
-COM_COMPONENTBUILDER_THE_WIKI_IS_LOADING="The wiki is loading"
 COM_COMPONENTBUILDER_THIS_BSB_IS_NOT_LINKED_TO_ANY_OTHER_AREAS_OF_JCB_AT_THIS_TIME="This <b>%s</b> is not linked to any other areas of JCB at this time!"
 COM_COMPONENTBUILDER_THIS_PACKAGE_BPASSEDB_THE_CHECKSUM_VALIDATIONBR_BR_SMALLMANUALLY_ALSO_VALIDATE_THAT_THE_CORRECT_CHECKSUM_WAS_USEDSMALLBR_THIS_CHECKSUM_BSB_MUST_BE_THE_SAME_AS_THE_ONE_FOUND_A_S_SA="This package <b>PASSED</b> the checksum validation!<br /><br /><small>Manually also validate that the correct checksum was used.</small><br />This checksum: <b>%s</b> must be the same as the one found @ <a %s %s</a>"
 COM_COMPONENTBUILDER_THIS_PACKAGE_HAS_NO_KEY="This package has no key."
@@ -6873,6 +7195,7 @@ COM_COMPONENTBUILDER_YOU_CAN_NOW_SELECT_THE_COMPONENT_BZIPB_PACKAGE_YOU_WOULD_LI
 COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_ACCESS_THE_SERVER_DETAILS_BS_DENIEDB_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_INFO="You do not have permission to access the server details (<b>%s - denied</b>), please contact your system administrator for more info."
 COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_CLONE_A_COMPONENT_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP="You do not have permission to clone a component, please contact your system administrator for more help."
 COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_IMPORT_A_COMPONENT_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP="You do not have permission to import a component, please contact your system administrator for more help."
+COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE="You do not have permission to run the expansion module!"
 COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_SHARE_THE_SNIPPETS_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP="You do not have permission to share the snippets, please contact your system administrator for more help."
 COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_S_S_IS_CONSIDERED_BAD_PRACTICE="You have %s %s. Adding more then %s %s is considered bad practice."
 COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_S_S_IS_CONSIDERED_BAD_PRACTICE_YOUR_S_PAGE_LOAD_IN_JCB_WILL_SLOWDOWN_YOU_SHOULD_CONSIDER_DECOUPLING_SOME_OF_THESE_S="You have %s %s. Adding more then %s %s is considered bad practice. Your %s page load in JCB will slowdown. You should consider decoupling some of these %s."

admin/language/en-GB/en-GB.com_componentbuilder.sys.ini

@@ -109,12 +109,16 @@ COM_COMPONENTBUILDER_ADMIN_VIEWS_IMPORT="Admin Views Import"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_IMPORT_DESC="Allows the users in this group to import import admin views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU="Admin Views Submenu"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU_DESC="Allows the users in this group to submenu of admin view"
+COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS="Admin View Run Expansion Button Access"
+COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_COMPILER_ACCESS="Compiler Access"
 COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC=" Allows the users in this group to access compiler."
 COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS="Compiler Clear tmp Button Access"
 COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clear tmp button."
 COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST="Compiler Dashboard List"
 COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Compiler"
+COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS="Compiler Run Expansion Button Access"
+COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_COMPILER_SUBMENU="Compiler Submenu"
 COM_COMPONENTBUILDER_COMPILER_SUBMENU_DESC="Allows the users in this group to submenu of Compiler"
 COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_ACCESS="Components Admin Views Access"
@@ -354,6 +358,8 @@ COM_COMPONENTBUILDER_CUSTOM_CODES_IMPORT="Custom Codes Import"
 COM_COMPONENTBUILDER_CUSTOM_CODES_IMPORT_DESC="Allows the users in this group to import import custom codes"
 COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU="Custom Codes Submenu"
 COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU_DESC="Allows the users in this group to submenu of custom code"
+COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS="Custom Code Run Expansion Button Access"
+COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS="Dynamic Gets Access"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS_DESC="Allows the users in this group to access access dynamic gets"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_BATCH_USE="Dynamic Gets Batch Use"
@@ -380,6 +386,8 @@ COM_COMPONENTBUILDER_DYNAMIC_GETS_IMPORT="Dynamic Gets Import"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_IMPORT_DESC="Allows the users in this group to import import dynamic gets"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU="Dynamic Gets Submenu"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU_DESC="Allows the users in this group to submenu of dynamic get"
+COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS="Dynamic Get Run Expansion Button Access"
+COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_EDIT_CREATED_BY="Edit Created By"
 COM_COMPONENTBUILDER_EDIT_CREATED_BY_DESC=" Allows users in this group to edit created by."
 COM_COMPONENTBUILDER_EDIT_CREATED_DATE="Edit Created Date"
@@ -426,12 +434,18 @@ COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_LIST="Fieldtypes Dashboard List"
 COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_DELETE="Fieldtypes Delete"
 COM_COMPONENTBUILDER_FIELDTYPES_DELETE_DESC="Allows the users in this group to delete delete fieldtypes"
-COM_COMPONENTBUILDER_FIELDTYPES_DESCRIPTION="Fieldtypes Description"
-COM_COMPONENTBUILDER_FIELDTYPES_DESCRIPTION_DESC="Allows the users in this group to description of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT="Fieldtypes Edit"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESC="Allows the users in this group to edit the fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION="Fieldtypes Edit Description"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION_DESC="Allows the users in this group to edit description of fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME="Fieldtypes Edit Name"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME_DESC="Allows the users in this group to edit name of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN="Fieldtypes Edit Own"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own fieldtypes created by them"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES="Fieldtypes Edit Properties"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES_DESC="Allows the users in this group to edit properties of fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION="Fieldtypes Edit Short Description"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION_DESC="Allows the users in this group to edit short description of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE="Fieldtypes Edit State"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE_DESC="Allows the users in this group to update the state of the fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION="Fieldtypes Edit Version"
@@ -440,14 +454,10 @@ COM_COMPONENTBUILDER_FIELDTYPES_EXPORT="Fieldtypes Export"
 COM_COMPONENTBUILDER_FIELDTYPES_EXPORT_DESC="Allows the users in this group to export export fieldtypes"
 COM_COMPONENTBUILDER_FIELDTYPES_IMPORT="Fieldtypes Import"
 COM_COMPONENTBUILDER_FIELDTYPES_IMPORT_DESC="Allows the users in this group to import import fieldtypes"
-COM_COMPONENTBUILDER_FIELDTYPES_NAME="Fieldtypes Name"
-COM_COMPONENTBUILDER_FIELDTYPES_NAME_DESC="Allows the users in this group to name of fieldtype"
-COM_COMPONENTBUILDER_FIELDTYPES_PROPERTIES="Fieldtypes Properties"
-COM_COMPONENTBUILDER_FIELDTYPES_PROPERTIES_DESC="Allows the users in this group to properties of fieldtype"
-COM_COMPONENTBUILDER_FIELDTYPES_SHORT_DESCRIPTION="Fieldtypes Short Description"
-COM_COMPONENTBUILDER_FIELDTYPES_SHORT_DESCRIPTION_DESC="Allows the users in this group to short description of fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU="Fieldtypes Submenu"
 COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU_DESC="Allows the users in this group to submenu of fieldtype"
+COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS="Field Run Expansion Button Access"
+COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS="Get Snippets Access"
 COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS_DESC=" Allows the users in this group to access get snippets."
 COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS="Get Snippets Custom Admin Views Button Access"
@@ -520,12 +530,16 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU="Joomla Components Submenu"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU_DESC="Allows the users in this group to submenu of joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS="Joomla Component Backup Button Access"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the backup button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS="Joomla Component Clear tmp Button Access"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clear tmp button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS="Joomla Component Clone Button Access"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clone button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS="Joomla Component Export JCB Packages Button Access"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the export jcb packages button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS="Joomla Component Import JCB Packages Button Access"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the import jcb packages button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS="Joomla Component Run Expansion Button Access"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_LANGUAGES_ACCESS="Languages Access"
 COM_COMPONENTBUILDER_LANGUAGES_ACCESS_DESC="Allows the users in this group to access access languages"
 COM_COMPONENTBUILDER_LANGUAGES_BATCH_USE="Languages Batch Use"
@@ -664,7 +678,7 @@ COM_COMPONENTBUILDER_LIBRARIES_SUBMENU="Libraries Submenu"
 COM_COMPONENTBUILDER_LIBRARIES_SUBMENU_DESC="Allows the users in this group to submenu of library"
 COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS="Library Get Snippets Button Access"
 COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
-COM_COMPONENTBUILDER_MENU="» Component Builder"
+COM_COMPONENTBUILDER_MENU="&#10003 Component Builder"
 COM_COMPONENTBUILDER_MENU_ADMIN_VIEWS="Admin Views"
 COM_COMPONENTBUILDER_MENU_COMPILER="Compiler"
 COM_COMPONENTBUILDER_MENU_CUSTOM_ADMIN_VIEWS="Custom Admin Views"

admin/layouts/admin_view/mysql_left.php

@@ -15,6 +15,9 @@ defined('_JEXEC') or die('Restricted access');
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
+	'mysql_table_engine',
+	'mysql_table_charset',
+	'mysql_table_collate',
 	'add_sql',
 	'source',
 	'addtables'

admin/layouts/joomla_component/settings_fullwidth.php

@@ -15,7 +15,7 @@ defined('_JEXEC') or die('Restricted access');
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
-	'spacer_hr_six',
+	'spacer_hr_seven',
 	'note_on_contributors',
 	'addcontributors',
 	'emptycontributors',

admin/layouts/joomla_component/settings_right.php

@@ -17,9 +17,12 @@ $form = $displayData->getForm();
 $fields = $displayData->get('fields') ?: array(
 	'note_component_files_folders',
 	'spacer_hr_four',
+	'add_menu_prefix',
+	'menu_prefix',
+	'spacer_hr_five',
 	'to_ignore_note',
 	'toignore',
-	'spacer_hr_five',
+	'spacer_hr_six',
 	'jcb_export_package_note',
 	'export_key',
 	'joomla_source_link',

admin/models/admin_view.php

@@ -86,88 +86,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->php_import_headers))
+			if (!empty($item->php_batchcopy))
 			{
-				// base64 Decode php_import_headers.
+				// base64 Decode php_batchcopy.
-				$item->php_import_headers = base64_decode($item->php_import_headers);
+				$item->php_batchcopy = base64_decode($item->php_batchcopy);
-			}
-
-			if (!empty($item->html_import_view))
-			{
-				// base64 Decode html_import_view.
-				$item->html_import_view = base64_decode($item->html_import_view);
-			}
-
-			if (!empty($item->php_import_save))
-			{
-				// base64 Decode php_import_save.
-				$item->php_import_save = base64_decode($item->php_import_save);
-			}
-
-			if (!empty($item->php_getitem))
-			{
-				// base64 Decode php_getitem.
-				$item->php_getitem = base64_decode($item->php_getitem);
-			}
-
-			if (!empty($item->php_getitems))
-			{
-				// base64 Decode php_getitems.
-				$item->php_getitems = base64_decode($item->php_getitems);
-			}
-
-			if (!empty($item->php_getitems_after_all))
-			{
-				// base64 Decode php_getitems_after_all.
-				$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
-			}
-
-			if (!empty($item->php_getlistquery))
-			{
-				// base64 Decode php_getlistquery.
-				$item->php_getlistquery = base64_decode($item->php_getlistquery);
-			}
-
-			if (!empty($item->css_view))
-			{
-				// base64 Decode css_view.
-				$item->css_view = base64_decode($item->css_view);
-			}
-
-			if (!empty($item->php_getform))
-			{
-				// base64 Decode php_getform.
-				$item->php_getform = base64_decode($item->php_getform);
-			}
-
-			if (!empty($item->php_before_save))
-			{
-				// base64 Decode php_before_save.
-				$item->php_before_save = base64_decode($item->php_before_save);
-			}
-
-			if (!empty($item->css_views))
-			{
-				// base64 Decode css_views.
-				$item->css_views = base64_decode($item->css_views);
-			}
-
-			if (!empty($item->php_save))
-			{
-				// base64 Decode php_save.
-				$item->php_save = base64_decode($item->php_save);
-			}
-
-			if (!empty($item->php_postsavehook))
-			{
-				// base64 Decode php_postsavehook.
-				$item->php_postsavehook = base64_decode($item->php_postsavehook);
-			}
-
-			if (!empty($item->javascript_view_file))
-			{
-				// base64 Decode javascript_view_file.
-				$item->javascript_view_file = base64_decode($item->javascript_view_file);
 			}
 
 			if (!empty($item->php_allowadd))
@@ -176,34 +98,34 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_allowadd = base64_decode($item->php_allowadd);
 			}
 
-			if (!empty($item->php_allowedit))
+			if (!empty($item->php_save))
 			{
-				// base64 Decode php_allowedit.
+				// base64 Decode php_save.
-				$item->php_allowedit = base64_decode($item->php_allowedit);
+				$item->php_save = base64_decode($item->php_save);
 			}
 
-			if (!empty($item->javascript_view_footer))
+			if (!empty($item->php_getform))
 			{
-				// base64 Decode javascript_view_footer.
+				// base64 Decode php_getform.
-				$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
+				$item->php_getform = base64_decode($item->php_getform);
 			}
 
-			if (!empty($item->php_batchcopy))
+			if (!empty($item->php_getitems_after_all))
 			{
-				// base64 Decode php_batchcopy.
+				// base64 Decode php_getitems_after_all.
-				$item->php_batchcopy = base64_decode($item->php_batchcopy);
+				$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
 			}
 
-			if (!empty($item->php_batchmove))
+			if (!empty($item->php_import_save))
 			{
-				// base64 Decode php_batchmove.
+				// base64 Decode php_import_save.
-				$item->php_batchmove = base64_decode($item->php_batchmove);
+				$item->php_import_save = base64_decode($item->php_import_save);
 			}
 
-			if (!empty($item->javascript_views_file))
+			if (!empty($item->php_document))
 			{
-				// base64 Decode javascript_views_file.
+				// base64 Decode php_document.
-				$item->javascript_views_file = base64_decode($item->javascript_views_file);
+				$item->php_document = base64_decode($item->php_document);
 			}
 
 			if (!empty($item->php_before_publish))
@@ -212,34 +134,106 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_before_publish = base64_decode($item->php_before_publish);
 			}
 
-			if (!empty($item->php_after_publish))
-			{
-				// base64 Decode php_after_publish.
-				$item->php_after_publish = base64_decode($item->php_after_publish);
-			}
-
-			if (!empty($item->javascript_views_footer))
-			{
-				// base64 Decode javascript_views_footer.
-				$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
-			}
-
 			if (!empty($item->php_before_delete))
 			{
 				// base64 Decode php_before_delete.
 				$item->php_before_delete = base64_decode($item->php_before_delete);
 			}
 
+			if (!empty($item->html_import_view))
+			{
+				// base64 Decode html_import_view.
+				$item->html_import_view = base64_decode($item->html_import_view);
+			}
+
+			if (!empty($item->php_getitems))
+			{
+				// base64 Decode php_getitems.
+				$item->php_getitems = base64_decode($item->php_getitems);
+			}
+
+			if (!empty($item->php_getlistquery))
+			{
+				// base64 Decode php_getlistquery.
+				$item->php_getlistquery = base64_decode($item->php_getlistquery);
+			}
+
+			if (!empty($item->php_before_save))
+			{
+				// base64 Decode php_before_save.
+				$item->php_before_save = base64_decode($item->php_before_save);
+			}
+
+			if (!empty($item->php_postsavehook))
+			{
+				// base64 Decode php_postsavehook.
+				$item->php_postsavehook = base64_decode($item->php_postsavehook);
+			}
+
+			if (!empty($item->php_allowedit))
+			{
+				// base64 Decode php_allowedit.
+				$item->php_allowedit = base64_decode($item->php_allowedit);
+			}
+
+			if (!empty($item->php_batchmove))
+			{
+				// base64 Decode php_batchmove.
+				$item->php_batchmove = base64_decode($item->php_batchmove);
+			}
+
+			if (!empty($item->php_after_publish))
+			{
+				// base64 Decode php_after_publish.
+				$item->php_after_publish = base64_decode($item->php_after_publish);
+			}
+
 			if (!empty($item->php_after_delete))
 			{
 				// base64 Decode php_after_delete.
 				$item->php_after_delete = base64_decode($item->php_after_delete);
 			}
 
-			if (!empty($item->php_document))
+			if (!empty($item->php_import_headers))
 			{
-				// base64 Decode php_document.
+				// base64 Decode php_import_headers.
-				$item->php_document = base64_decode($item->php_document);
+				$item->php_import_headers = base64_decode($item->php_import_headers);
+			}
+
+			if (!empty($item->css_view))
+			{
+				// base64 Decode css_view.
+				$item->css_view = base64_decode($item->css_view);
+			}
+
+			if (!empty($item->css_views))
+			{
+				// base64 Decode css_views.
+				$item->css_views = base64_decode($item->css_views);
+			}
+
+			if (!empty($item->javascript_view_file))
+			{
+				// base64 Decode javascript_view_file.
+				$item->javascript_view_file = base64_decode($item->javascript_view_file);
+			}
+
+			if (!empty($item->javascript_view_footer))
+			{
+				// base64 Decode javascript_view_footer.
+				$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
+			}
+
+			if (!empty($item->javascript_views_file))
+			{
+				// base64 Decode javascript_views_file.
+				$item->javascript_views_file = base64_decode($item->javascript_views_file);
+			}
+
+			if (!empty($item->javascript_views_footer))
+			{
+				// base64 Decode javascript_views_footer.
+				$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
 			}
 
 			if (!empty($item->php_controller))
@@ -254,12 +248,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_model = base64_decode($item->php_model);
 			}
 
-			if (!empty($item->sql))
-			{
-				// base64 Decode sql.
-				$item->sql = base64_decode($item->sql);
-			}
-
 			if (!empty($item->php_controller_list))
 			{
 				// base64 Decode php_controller_list.
@@ -272,6 +260,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_model_list = base64_decode($item->php_model_list);
 			}
 
+			if (!empty($item->sql))
+			{
+				// base64 Decode sql.
+				$item->sql = base64_decode($item->sql);
+			}
+
+			if (!empty($item->php_ajaxmethod))
+			{
+				// base64 Decode php_ajaxmethod.
+				$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
+			}
+
 			if (!empty($item->php_import_display))
 			{
 				// base64 Decode php_import_display.
@@ -284,32 +284,24 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_import = base64_decode($item->php_import);
 			}
 
-			if (!empty($item->php_ajaxmethod))
-			{
-				// base64 Decode php_ajaxmethod.
-				$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
-			}
-
 			if (!empty($item->php_import_setdata))
 			{
 				// base64 Decode php_import_setdata.
 				$item->php_import_setdata = base64_decode($item->php_import_setdata);
 			}
 
+			if (!empty($item->php_getitem))
+			{
+				// base64 Decode php_getitem.
+				$item->php_getitem = base64_decode($item->php_getitem);
+			}
+
 			if (!empty($item->php_import_ext))
 			{
 				// base64 Decode php_import_ext.
 				$item->php_import_ext = base64_decode($item->php_import_ext);
 			}
 
-			if (!empty($item->addtables))
-			{
-				// Convert the addtables field to an array.
-				$addtables = new Registry;
-				$addtables->loadString($item->addtables);
-				$item->addtables = $addtables->toArray();
-			}
-
 			if (!empty($item->addpermissions))
 			{
 				// Convert the addpermissions field to an array.
@@ -334,6 +326,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->addlinked_views = $addlinked_views->toArray();
 			}
 
+			if (!empty($item->addtables))
+			{
+				// Convert the addtables field to an array.
+				$addtables = new Registry;
+				$addtables->loadString($item->addtables);
+				$item->addtables = $addtables->toArray();
+			}
+
 			if (!empty($item->alias_builder))
 			{
 				// Convert the alias_builder field to an array.
@@ -1220,19 +1220,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['system_name'] = $data['name_single'];
 		}
 
-		// Set the addtables items to data.
-		if (isset($data['addtables']) && is_array($data['addtables']))
-		{
-			$addtables = new JRegistry;
-			$addtables->loadArray($data['addtables']);
-			$data['addtables'] = (string) $addtables;
-		}
-		elseif (!isset($data['addtables']))
-		{
-			// Set the empty addtables to data
-			$data['addtables'] = '';
-		}
-
 		// Set the addpermissions items to data.
 		if (isset($data['addpermissions']) && is_array($data['addpermissions']))
 		{
@@ -1272,6 +1259,19 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['addlinked_views'] = '';
 		}
 
+		// Set the addtables items to data.
+		if (isset($data['addtables']) && is_array($data['addtables']))
+		{
+			$addtables = new JRegistry;
+			$addtables->loadArray($data['addtables']);
+			$data['addtables'] = (string) $addtables;
+		}
+		elseif (!isset($data['addtables']))
+		{
+			// Set the empty addtables to data
+			$data['addtables'] = '';
+		}
+
 		// Set the alias_builder items to data.
 		if (isset($data['alias_builder']) && is_array($data['alias_builder']))
 		{
@@ -1311,88 +1311,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['ajax_input'] = '';
 		}
 
-		// Set the php_import_headers string to base64 string.
+		// Set the php_batchcopy string to base64 string.
-		if (isset($data['php_import_headers']))
+		if (isset($data['php_batchcopy']))
 		{
-			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
+			$data['php_batchcopy'] = base64_encode($data['php_batchcopy']);
-		}
-
-		// Set the html_import_view string to base64 string.
-		if (isset($data['html_import_view']))
-		{
-			$data['html_import_view'] = base64_encode($data['html_import_view']);
-		}
-
-		// Set the php_import_save string to base64 string.
-		if (isset($data['php_import_save']))
-		{
-			$data['php_import_save'] = base64_encode($data['php_import_save']);
-		}
-
-		// Set the php_getitem string to base64 string.
-		if (isset($data['php_getitem']))
-		{
-			$data['php_getitem'] = base64_encode($data['php_getitem']);
-		}
-
-		// Set the php_getitems string to base64 string.
-		if (isset($data['php_getitems']))
-		{
-			$data['php_getitems'] = base64_encode($data['php_getitems']);
-		}
-
-		// Set the php_getitems_after_all string to base64 string.
-		if (isset($data['php_getitems_after_all']))
-		{
-			$data['php_getitems_after_all'] = base64_encode($data['php_getitems_after_all']);
-		}
-
-		// Set the php_getlistquery string to base64 string.
-		if (isset($data['php_getlistquery']))
-		{
-			$data['php_getlistquery'] = base64_encode($data['php_getlistquery']);
-		}
-
-		// Set the css_view string to base64 string.
-		if (isset($data['css_view']))
-		{
-			$data['css_view'] = base64_encode($data['css_view']);
-		}
-
-		// Set the php_getform string to base64 string.
-		if (isset($data['php_getform']))
-		{
-			$data['php_getform'] = base64_encode($data['php_getform']);
-		}
-
-		// Set the php_before_save string to base64 string.
-		if (isset($data['php_before_save']))
-		{
-			$data['php_before_save'] = base64_encode($data['php_before_save']);
-		}
-
-		// Set the css_views string to base64 string.
-		if (isset($data['css_views']))
-		{
-			$data['css_views'] = base64_encode($data['css_views']);
-		}
-
-		// Set the php_save string to base64 string.
-		if (isset($data['php_save']))
-		{
-			$data['php_save'] = base64_encode($data['php_save']);
-		}
-
-		// Set the php_postsavehook string to base64 string.
-		if (isset($data['php_postsavehook']))
-		{
-			$data['php_postsavehook'] = base64_encode($data['php_postsavehook']);
-		}
-
-		// Set the javascript_view_file string to base64 string.
-		if (isset($data['javascript_view_file']))
-		{
-			$data['javascript_view_file'] = base64_encode($data['javascript_view_file']);
 		}
 
 		// Set the php_allowadd string to base64 string.
@@ -1401,34 +1323,34 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_allowadd'] = base64_encode($data['php_allowadd']);
 		}
 
-		// Set the php_allowedit string to base64 string.
+		// Set the php_save string to base64 string.
-		if (isset($data['php_allowedit']))
+		if (isset($data['php_save']))
 		{
-			$data['php_allowedit'] = base64_encode($data['php_allowedit']);
+			$data['php_save'] = base64_encode($data['php_save']);
 		}
 
-		// Set the javascript_view_footer string to base64 string.
+		// Set the php_getform string to base64 string.
-		if (isset($data['javascript_view_footer']))
+		if (isset($data['php_getform']))
 		{
-			$data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
+			$data['php_getform'] = base64_encode($data['php_getform']);
 		}
 
-		// Set the php_batchcopy string to base64 string.
+		// Set the php_getitems_after_all string to base64 string.
-		if (isset($data['php_batchcopy']))
+		if (isset($data['php_getitems_after_all']))
 		{
-			$data['php_batchcopy'] = base64_encode($data['php_batchcopy']);
+			$data['php_getitems_after_all'] = base64_encode($data['php_getitems_after_all']);
 		}
 
-		// Set the php_batchmove string to base64 string.
+		// Set the php_import_save string to base64 string.
-		if (isset($data['php_batchmove']))
+		if (isset($data['php_import_save']))
 		{
-			$data['php_batchmove'] = base64_encode($data['php_batchmove']);
+			$data['php_import_save'] = base64_encode($data['php_import_save']);
 		}
 
-		// Set the javascript_views_file string to base64 string.
+		// Set the php_document string to base64 string.
-		if (isset($data['javascript_views_file']))
+		if (isset($data['php_document']))
 		{
-			$data['javascript_views_file'] = base64_encode($data['javascript_views_file']);
+			$data['php_document'] = base64_encode($data['php_document']);
 		}
 
 		// Set the php_before_publish string to base64 string.
@@ -1437,34 +1359,106 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_before_publish'] = base64_encode($data['php_before_publish']);
 		}
 
-		// Set the php_after_publish string to base64 string.
-		if (isset($data['php_after_publish']))
-		{
-			$data['php_after_publish'] = base64_encode($data['php_after_publish']);
-		}
-
-		// Set the javascript_views_footer string to base64 string.
-		if (isset($data['javascript_views_footer']))
-		{
-			$data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']);
-		}
-
 		// Set the php_before_delete string to base64 string.
 		if (isset($data['php_before_delete']))
 		{
 			$data['php_before_delete'] = base64_encode($data['php_before_delete']);
 		}
 
+		// Set the html_import_view string to base64 string.
+		if (isset($data['html_import_view']))
+		{
+			$data['html_import_view'] = base64_encode($data['html_import_view']);
+		}
+
+		// Set the php_getitems string to base64 string.
+		if (isset($data['php_getitems']))
+		{
+			$data['php_getitems'] = base64_encode($data['php_getitems']);
+		}
+
+		// Set the php_getlistquery string to base64 string.
+		if (isset($data['php_getlistquery']))
+		{
+			$data['php_getlistquery'] = base64_encode($data['php_getlistquery']);
+		}
+
+		// Set the php_before_save string to base64 string.
+		if (isset($data['php_before_save']))
+		{
+			$data['php_before_save'] = base64_encode($data['php_before_save']);
+		}
+
+		// Set the php_postsavehook string to base64 string.
+		if (isset($data['php_postsavehook']))
+		{
+			$data['php_postsavehook'] = base64_encode($data['php_postsavehook']);
+		}
+
+		// Set the php_allowedit string to base64 string.
+		if (isset($data['php_allowedit']))
+		{
+			$data['php_allowedit'] = base64_encode($data['php_allowedit']);
+		}
+
+		// Set the php_batchmove string to base64 string.
+		if (isset($data['php_batchmove']))
+		{
+			$data['php_batchmove'] = base64_encode($data['php_batchmove']);
+		}
+
+		// Set the php_after_publish string to base64 string.
+		if (isset($data['php_after_publish']))
+		{
+			$data['php_after_publish'] = base64_encode($data['php_after_publish']);
+		}
+
 		// Set the php_after_delete string to base64 string.
 		if (isset($data['php_after_delete']))
 		{
 			$data['php_after_delete'] = base64_encode($data['php_after_delete']);
 		}
 
-		// Set the php_document string to base64 string.
+		// Set the php_import_headers string to base64 string.
-		if (isset($data['php_document']))
+		if (isset($data['php_import_headers']))
 		{
-			$data['php_document'] = base64_encode($data['php_document']);
+			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
+		}
+
+		// Set the css_view string to base64 string.
+		if (isset($data['css_view']))
+		{
+			$data['css_view'] = base64_encode($data['css_view']);
+		}
+
+		// Set the css_views string to base64 string.
+		if (isset($data['css_views']))
+		{
+			$data['css_views'] = base64_encode($data['css_views']);
+		}
+
+		// Set the javascript_view_file string to base64 string.
+		if (isset($data['javascript_view_file']))
+		{
+			$data['javascript_view_file'] = base64_encode($data['javascript_view_file']);
+		}
+
+		// Set the javascript_view_footer string to base64 string.
+		if (isset($data['javascript_view_footer']))
+		{
+			$data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
+		}
+
+		// Set the javascript_views_file string to base64 string.
+		if (isset($data['javascript_views_file']))
+		{
+			$data['javascript_views_file'] = base64_encode($data['javascript_views_file']);
+		}
+
+		// Set the javascript_views_footer string to base64 string.
+		if (isset($data['javascript_views_footer']))
+		{
+			$data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']);
 		}
 
 		// Set the php_controller string to base64 string.
@@ -1479,12 +1473,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_model'] = base64_encode($data['php_model']);
 		}
 
-		// Set the sql string to base64 string.
-		if (isset($data['sql']))
-		{
-			$data['sql'] = base64_encode($data['sql']);
-		}
-
 		// Set the php_controller_list string to base64 string.
 		if (isset($data['php_controller_list']))
 		{
@@ -1497,6 +1485,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_model_list'] = base64_encode($data['php_model_list']);
 		}
 
+		// Set the sql string to base64 string.
+		if (isset($data['sql']))
+		{
+			$data['sql'] = base64_encode($data['sql']);
+		}
+
+		// Set the php_ajaxmethod string to base64 string.
+		if (isset($data['php_ajaxmethod']))
+		{
+			$data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
+		}
+
 		// Set the php_import_display string to base64 string.
 		if (isset($data['php_import_display']))
 		{
@@ -1509,18 +1509,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_import'] = base64_encode($data['php_import']);
 		}
 
-		// Set the php_ajaxmethod string to base64 string.
-		if (isset($data['php_ajaxmethod']))
-		{
-			$data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
-		}
-
 		// Set the php_import_setdata string to base64 string.
 		if (isset($data['php_import_setdata']))
 		{
 			$data['php_import_setdata'] = base64_encode($data['php_import_setdata']);
 		}
 
+		// Set the php_getitem string to base64 string.
+		if (isset($data['php_getitem']))
+		{
+			$data['php_getitem'] = base64_encode($data['php_getitem']);
+		}
+
 		// Set the php_import_ext string to base64 string.
 		if (isset($data['php_import_ext']))
 		{

admin/models/admin_views.php

@@ -31,8 +31,8 @@ class ComponentbuilderModelAdmin_views extends JModelList
 				'a.name_single','name_single',
 				'a.short_description','short_description',
 				'a.add_fadein','add_fadein',
-				'a.add_custom_import','add_custom_import',
 				'a.type','type',
+				'a.add_custom_import','add_custom_import',
 				'a.add_custom_button','add_custom_button',
 				'a.add_php_ajax','add_php_ajax'
 			);
@@ -67,12 +67,12 @@ class ComponentbuilderModelAdmin_views extends JModelList
 		$add_fadein = $this->getUserStateFromRequest($this->context . '.filter.add_fadein', 'filter_add_fadein');
 		$this->setState('filter.add_fadein', $add_fadein);
 
-		$add_custom_import = $this->getUserStateFromRequest($this->context . '.filter.add_custom_import', 'filter_add_custom_import');
-		$this->setState('filter.add_custom_import', $add_custom_import);
-
 		$type = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type');
 		$this->setState('filter.type', $type);
 
+		$add_custom_import = $this->getUserStateFromRequest($this->context . '.filter.add_custom_import', 'filter_add_custom_import');
+		$this->setState('filter.add_custom_import', $add_custom_import);
+
 		$add_custom_button = $this->getUserStateFromRequest($this->context . '.filter.add_custom_button', 'filter_add_custom_button');
 		$this->setState('filter.add_custom_button', $add_custom_button);
 
@@ -136,10 +136,10 @@ class ComponentbuilderModelAdmin_views extends JModelList
 			{
 				// convert add_fadein
 				$item->add_fadein = $this->selectionTranslation($item->add_fadein, 'add_fadein');
-				// convert add_custom_import
-				$item->add_custom_import = $this->selectionTranslation($item->add_custom_import, 'add_custom_import');
 				// convert type
 				$item->type = $this->selectionTranslation($item->type, 'type');
+				// convert add_custom_import
+				$item->add_custom_import = $this->selectionTranslation($item->add_custom_import, 'add_custom_import');
 				// convert add_custom_button
 				$item->add_custom_button = $this->selectionTranslation($item->add_custom_button, 'add_custom_button');
 				// convert add_php_ajax
@@ -172,19 +172,6 @@ class ComponentbuilderModelAdmin_views extends JModelList
 				return $add_fadeinArray[$value];
 			}
 		}
-		// Array of add_custom_import language strings
-		if ($name === 'add_custom_import')
-		{
-			$add_custom_importArray = array(
-				1 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_YES',
-				0 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_NO'
-			);
-			// Now check if value is found in this array
-			if (isset($add_custom_importArray[$value]) && ComponentbuilderHelper::checkString($add_custom_importArray[$value]))
-			{
-				return $add_custom_importArray[$value];
-			}
-		}
 		// Array of type language strings
 		if ($name === 'type')
 		{
@@ -198,6 +185,19 @@ class ComponentbuilderModelAdmin_views extends JModelList
 				return $typeArray[$value];
 			}
 		}
+		// Array of add_custom_import language strings
+		if ($name === 'add_custom_import')
+		{
+			$add_custom_importArray = array(
+				1 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_YES',
+				0 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_NO'
+			);
+			// Now check if value is found in this array
+			if (isset($add_custom_importArray[$value]) && ComponentbuilderHelper::checkString($add_custom_importArray[$value]))
+			{
+				return $add_custom_importArray[$value];
+			}
+		}
 		// Array of add_custom_button language strings
 		if ($name === 'add_custom_button')
 		{
@@ -282,7 +282,7 @@ class ComponentbuilderModelAdmin_views extends JModelList
 			else
 			{
 				$search = $db->quote('%' . $db->escape($search) . '%');
-				$query->where('(a.system_name LIKE '.$search.' OR a.name_single LIKE '.$search.' OR a.short_description LIKE '.$search.' OR a.description LIKE '.$search.' OR a.name_list LIKE '.$search.' OR a.type LIKE '.$search.')');
+				$query->where('(a.system_name LIKE '.$search.' OR a.name_single LIKE '.$search.' OR a.short_description LIKE '.$search.' OR a.description LIKE '.$search.' OR a.type LIKE '.$search.' OR a.name_list LIKE '.$search.')');
 			}
 		}
 
@@ -291,16 +291,16 @@ class ComponentbuilderModelAdmin_views extends JModelList
 		{
 			$query->where('a.add_fadein = ' . $db->quote($db->escape($add_fadein)));
 		}
-		// Filter by Add_custom_import.
-		if ($add_custom_import = $this->getState('filter.add_custom_import'))
-		{
-			$query->where('a.add_custom_import = ' . $db->quote($db->escape($add_custom_import)));
-		}
 		// Filter by Type.
 		if ($type = $this->getState('filter.type'))
 		{
 			$query->where('a.type = ' . $db->quote($db->escape($type)));
 		}
+		// Filter by Add_custom_import.
+		if ($add_custom_import = $this->getState('filter.add_custom_import'))
+		{
+			$query->where('a.add_custom_import = ' . $db->quote($db->escape($add_custom_import)));
+		}
 		// Filter by Add_custom_button.
 		if ($add_custom_button = $this->getState('filter.add_custom_button'))
 		{
@@ -376,76 +376,76 @@ class ComponentbuilderModelAdmin_views extends JModelList
 							continue;
 						}
 
-						// decode php_import_headers
-						$item->php_import_headers = base64_decode($item->php_import_headers);
-						// decode html_import_view
-						$item->html_import_view = base64_decode($item->html_import_view);
-						// decode php_import_save
-						$item->php_import_save = base64_decode($item->php_import_save);
-						// decode php_getitem
-						$item->php_getitem = base64_decode($item->php_getitem);
-						// decode php_getitems
-						$item->php_getitems = base64_decode($item->php_getitems);
-						// decode php_getitems_after_all
-						$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
-						// decode php_getlistquery
-						$item->php_getlistquery = base64_decode($item->php_getlistquery);
-						// decode css_view
-						$item->css_view = base64_decode($item->css_view);
-						// decode php_getform
-						$item->php_getform = base64_decode($item->php_getform);
-						// decode php_before_save
-						$item->php_before_save = base64_decode($item->php_before_save);
-						// decode css_views
-						$item->css_views = base64_decode($item->css_views);
-						// decode php_save
-						$item->php_save = base64_decode($item->php_save);
-						// decode php_postsavehook
-						$item->php_postsavehook = base64_decode($item->php_postsavehook);
-						// decode javascript_view_file
-						$item->javascript_view_file = base64_decode($item->javascript_view_file);
-						// decode php_allowadd
-						$item->php_allowadd = base64_decode($item->php_allowadd);
-						// decode php_allowedit
-						$item->php_allowedit = base64_decode($item->php_allowedit);
-						// decode javascript_view_footer
-						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
 						// decode php_batchcopy
 						$item->php_batchcopy = base64_decode($item->php_batchcopy);
-						// decode php_batchmove
+						// decode php_allowadd
-						$item->php_batchmove = base64_decode($item->php_batchmove);
+						$item->php_allowadd = base64_decode($item->php_allowadd);
-						// decode javascript_views_file
+						// decode php_save
-						$item->javascript_views_file = base64_decode($item->javascript_views_file);
+						$item->php_save = base64_decode($item->php_save);
-						// decode php_before_publish
+						// decode php_getform
-						$item->php_before_publish = base64_decode($item->php_before_publish);
+						$item->php_getform = base64_decode($item->php_getform);
-						// decode php_after_publish
+						// decode php_getitems_after_all
-						$item->php_after_publish = base64_decode($item->php_after_publish);
+						$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
-						// decode javascript_views_footer
+						// decode php_import_save
-						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
+						$item->php_import_save = base64_decode($item->php_import_save);
-						// decode php_before_delete
-						$item->php_before_delete = base64_decode($item->php_before_delete);
-						// decode php_after_delete
-						$item->php_after_delete = base64_decode($item->php_after_delete);
 						// decode php_document
 						$item->php_document = base64_decode($item->php_document);
+						// decode php_before_publish
+						$item->php_before_publish = base64_decode($item->php_before_publish);
+						// decode php_before_delete
+						$item->php_before_delete = base64_decode($item->php_before_delete);
+						// decode html_import_view
+						$item->html_import_view = base64_decode($item->html_import_view);
+						// decode php_getitems
+						$item->php_getitems = base64_decode($item->php_getitems);
+						// decode php_getlistquery
+						$item->php_getlistquery = base64_decode($item->php_getlistquery);
+						// decode php_before_save
+						$item->php_before_save = base64_decode($item->php_before_save);
+						// decode php_postsavehook
+						$item->php_postsavehook = base64_decode($item->php_postsavehook);
+						// decode php_allowedit
+						$item->php_allowedit = base64_decode($item->php_allowedit);
+						// decode php_batchmove
+						$item->php_batchmove = base64_decode($item->php_batchmove);
+						// decode php_after_publish
+						$item->php_after_publish = base64_decode($item->php_after_publish);
+						// decode php_after_delete
+						$item->php_after_delete = base64_decode($item->php_after_delete);
+						// decode php_import_headers
+						$item->php_import_headers = base64_decode($item->php_import_headers);
+						// decode css_view
+						$item->css_view = base64_decode($item->css_view);
+						// decode css_views
+						$item->css_views = base64_decode($item->css_views);
+						// decode javascript_view_file
+						$item->javascript_view_file = base64_decode($item->javascript_view_file);
+						// decode javascript_view_footer
+						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
+						// decode javascript_views_file
+						$item->javascript_views_file = base64_decode($item->javascript_views_file);
+						// decode javascript_views_footer
+						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
 						// decode php_controller
 						$item->php_controller = base64_decode($item->php_controller);
 						// decode php_model
 						$item->php_model = base64_decode($item->php_model);
-						// decode sql
-						$item->sql = base64_decode($item->sql);
 						// decode php_controller_list
 						$item->php_controller_list = base64_decode($item->php_controller_list);
 						// decode php_model_list
 						$item->php_model_list = base64_decode($item->php_model_list);
+						// decode sql
+						$item->sql = base64_decode($item->sql);
+						// decode php_ajaxmethod
+						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
 						// decode php_import_display
 						$item->php_import_display = base64_decode($item->php_import_display);
 						// decode php_import
 						$item->php_import = base64_decode($item->php_import);
-						// decode php_ajaxmethod
-						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
 						// decode php_import_setdata
 						$item->php_import_setdata = base64_decode($item->php_import_setdata);
+						// decode php_getitem
+						$item->php_getitem = base64_decode($item->php_getitem);
 						// decode php_import_ext
 						$item->php_import_ext = base64_decode($item->php_import_ext);
 						// unset the values we don't want exported.
@@ -512,8 +512,8 @@ class ComponentbuilderModelAdmin_views extends JModelList
 		$id .= ':' . $this->getState('filter.name_single');
 		$id .= ':' . $this->getState('filter.short_description');
 		$id .= ':' . $this->getState('filter.add_fadein');
-		$id .= ':' . $this->getState('filter.add_custom_import');
 		$id .= ':' . $this->getState('filter.type');
+		$id .= ':' . $this->getState('filter.add_custom_import');
 		$id .= ':' . $this->getState('filter.add_custom_button');
 		$id .= ':' . $this->getState('filter.add_php_ajax');
 

admin/models/ajax.php

@@ -2065,7 +2065,18 @@ class ComponentbuilderModelAjax extends JModelList
 						{
 							if (!isset($target['not_base64'][$key]))
 							{
-								$value = base64_decode($value);
+								$value = ComponentbuilderHelper::openValidBase64($value, null);
+							}
+							elseif ('json' === $target['not_base64'][$key] && 'xml' === $key) // just for field search
+							{
+								$value = json_decode($value);
+							}
+							// check if we should search for base64 string inside the text
+							if (isset($target['base64_search']) && isset($target['base64_search'][$key])
+								&& isset($target['base64_search'][$key]['start']) && strpos($value, $target['base64_search'][$key]['start']) !== false)
+							{
+								// search and open the base64 strings
+								$this->searchOpenBase64($value, $target['base64_search'][$key]);
 							}
 							// check if place holder set
 							if (strpos($value, '[CUSTOMC' . 'ODE=' . (string) $functioName . ']') !== false || strpos($value, '[CUSTOMC' . 'ODE=' . (int) $id . ']') !== false ||
@@ -2089,7 +2100,7 @@ class ComponentbuilderModelAjax extends JModelList
 					$usedin = array();
 					foreach ($bucket as $editId => $values)
 					{
-						$usedin[] = '<a href="index.php?option=com_componentbuilder&ref=custom_code&refid=' . (int) $id . '&view=' . $target['view'] . '&task=' . $target['table'] . '.edit&id=' . (int) $editId . '">' . $values['name'] . '</a> (' . implode(', ', $values['fields']) . ')';
+						$usedin[] = '<a href="index.php?option=com_componentbuilder&ref=custom_code&refid=' . (int) $id . '&view=' . $target['views'] . '&task=' . $target['table'] . '.edit&id=' . (int) $editId . '">' . $values['name'] . '</a> (' . implode(', ', $values['fields']) . ')';
 					}
 					$html = '<ul><li>' . implode('</li><li>', $usedin) . '</li></ul>';
 					return array('in' => $html, 'id' => $targeting);
@@ -2099,10 +2110,179 @@ class ComponentbuilderModelAjax extends JModelList
 		return false;
 	}
 
+	/**
+	* Search for base64 strings and decode them
+	*
+	*  @param   string    $value  The string to search
+	*  @param   array    $target   The target search values
+	* 
+	*  @return  void
+	* 
+	*/
+	protected function searchOpenBase64(&$value, &$target)
+	{
+		// first get the start property (if dynamic)
+		$starts =  array();
+		if (isset($target['_start']))
+		{
+			// get all values
+			$allBetween = ComponentbuilderHelper::getAllBetween($value, $target['start'], $target['_start']);
+			// just again make sure we found some
+			if (ComponentbuilderHelper::checkArray($allBetween))
+			{
+				if (count((array) $allBetween) > 1)
+				{
+					// search for many
+					foreach ($allBetween as $between)
+					{
+						// load the starting property
+						$start = $target['start'];
+						$start .= $between;
+						$start .= $target['_start'];
+
+						$starts[] = $start;
+					}
+				}
+				else
+				{
+					// load the starting property
+					$start = $target['start'];
+					$start .= array_values($allBetween)[0];
+					$start .= $target['_start'];
+
+					$starts[] = $start;
+				}
+			}
+		}
+		else
+		{
+			$starts[] = $target['start'];
+		}
+		// has any been found
+		if (ComponentbuilderHelper::checkArray($starts))
+		{
+			foreach ($starts as $_start)
+			{
+				// get the base64 string
+				$base64 = ComponentbuilderHelper::getBetween($value, $_start, $target['end']);
+				// now open the base64 text
+				$tmp = ComponentbuilderHelper::openValidBase64($base64);
+				// insert it back into the value (so we still search the whole string)
+				$value = str_replace($base64, $tmp, $value);
+			}
+		}
+	}
+
+
+	/**
+	 * The code search keys/targets
+	 * 
+	 * @var      array
+	 */
+	protected $codeSearchKeys = array(
+		// #__componentbuilder_joomla_component
+		'joomla_component' => array(
+			'search' => array('id', 'system_name', 'php_preflight_install','php_postflight_install',
+				'php_preflight_update','php_postflight_update','php_method_uninstall',
+				'php_helper_admin','php_admin_event','php_helper_both','php_helper_site',
+				'php_site_event','javascript'),
+			'views' => 'joomla_components',
+			'not_base64' => array(),
+			'name' => 'system_name'
+		),
+		// #__componentbuilder_component_dashboard
+		'component_dashboard' => array(
+			'search' => array('id', 'joomla_component', 'php_dashboard_methods','dashboard_tab'),
+			'views' => 'components_dashboard',
+			'not_base64' => array('dashboard_tab' => 'json'),
+			'name' => 'joomla_component->id:joomla_component.system_name'
+		),
+		// #__componentbuilder_admin_view
+		'admin_view' => array(
+			'search' => array('id', 'system_name', 'javascript_view_file','javascript_view_footer',
+				'javascript_views_file','javascript_views_footer','html_import_view',
+				'php_after_delete','php_after_publish','php_ajaxmethod','php_allowedit','php_batchcopy',
+				'php_batchmove','php_before_delete','php_before_publish','php_before_save','php_controller',
+				'php_controller_list','php_document','php_getitem','php_getitems','php_getitems_after_all',
+				'php_getlistquery','php_import','php_import_display','php_import_ext','php_import_headers','php_getform',
+				'php_import_save','php_import_setdata','php_model','php_model_list','php_postsavehook','php_save'),
+			'views' => 'admin_views',
+			'not_base64' => array(),
+			'name' => 'system_name'
+		),
+		// #__componentbuilder_admin_fields_relations
+		'admin_fields_relations' => array(
+			'search' => array('id', 'admin_view', 'addrelations'),
+			'views' => 'admins_fields_relations',
+			'not_base64' => array('addrelations' => 'json'),
+			'name' => 'admin_view->id:admin_view.system_name'
+		),
+		// #__componentbuilder_custom_admin_view
+		'custom_admin_view' => array(
+			'search' => array('id', 'system_name', 'default','php_view','php_jview','php_jview_display','php_document',
+				'js_document','css_document','css','php_ajaxmethod','php_model','php_controller'),
+			'views' => 'custom_admin_views',
+			'not_base64' => array(),
+			'name' => 'system_name'
+		),
+		// #__componentbuilder_site_view
+		'site_view' => array(
+			'search' => array('id', 'system_name', 'default','php_view','php_jview','php_jview_display','php_document',
+				'js_document','css_document','css','php_ajaxmethod','php_model','php_controller'),
+			'views' => 'site_views',
+			'not_base64' => array(),
+			'name' => 'system_name'
+		),
+		// #__componentbuilder_field
+		'field' => array(
+			'search' => array('id', 'name', 'xml','javascript_view_footer','javascript_views_footer'),
+			'views' => 'fields',
+			'not_base64' => array('xml' => 'json'),
+			'base64_search' => array('xml' => array('start' => 'type_php', '_start' => '="', 'end' => '"')),
+			'name' => 'name'
+		),
+		// #__componentbuilder_fieldtype
+		'fieldtype' => array(
+			'search' => array('id', 'name', 'properties'),
+			'views' => 'fieldtypes',
+			'not_base64' => array('properties' => 'json'),
+			'name' => 'name'
+		),
+		// #__componentbuilder_dynamic_get
+		'dynamic_get' => array(
+			'search' => array('id', 'name', 'php_before_getitem','php_after_getitem','php_before_getitems','php_after_getitems',
+				'php_getlistquery'),
+			'views' => 'dynamic_gets',
+			'not_base64' => array(),
+			'name' => 'name'
+		),
+		// #__componentbuilder_template
+		'template' => array(
+			'search' => array('id', 'name', 'php_view','template'),
+			'views' => 'templates',
+			'not_base64' => array(),
+			'name' => 'name'
+		),
+		// #__componentbuilder_layout
+		'layout' => array(
+			'search' => array('id', 'name', 'php_view','layout'),
+			'views' => 'layouts',
+			'not_base64' => array(),
+			'name' => 'name'
+		),
+		// #__componentbuilder_library
+		'library' => array(
+			'search' => array('id', 'name', 'php_setdocument'),
+			'views' => 'libraries',
+			'not_base64' => array(),
+			'name' => 'name'
+		)
+	);
+
 	/**
 	* Get the keys of the values to search custom code in
 	*
-	*  @param   string    $targe  The table targeted
+	*  @param   string    $target  The table targeted
 	*  @param   string    $type   The type of get
 	* 
 	*  @return  array      The query options
@@ -2113,136 +2293,44 @@ class ComponentbuilderModelAjax extends JModelList
 		// set the template if type is query
 		if ('query' === $type)
 		{
-			$tables = array(
+			// setup the tables
-				'a' => 'joomla_component',
+			$tables = array();
-				'b' => 'admin_view',
+			$key = 'a';
-				'c' => 'custom_admin_view',
+			foreach (array_keys($this->codeSearchKeys) as $table)
-				'd' => 'site_view',
+			{
-				'e' => 'field',
+				$tables[$key] = $table;
-				'f' => 'dynamic_get',
+				$key++;
-				'g' => 'template',
+			}
-				'h' => 'layout',
-				'i' => 'component_dashboard',
-				'j' => 'library',
-			);
 			// check if we have a match
 			if (isset($tables[$target]))
 			{
 				$target = $tables[$target];
 			}
 		}
-		// start target arrays
-		$targets = array();
-		// #__componentbuilder_joomla_component
-		$targets['joomla_component'] = array();
-		$targets['joomla_component']['search'] = array('id', 'system_name', 'php_preflight_install','php_postflight_install',
-			'php_preflight_update','php_postflight_update','php_method_uninstall',
-			'php_helper_admin','php_admin_event','php_helper_both','php_helper_site',
-			'php_site_event','javascript');
-		$targets['joomla_component']['view'] = 'joomla_components';
-		$targets['joomla_component']['not_base64'] = array();
-		$targets['joomla_component']['name'] = 'system_name';
-
-		// #__componentbuilder_component_dashboard
-		$targets['component_dashboard'] = array();
-		$targets['component_dashboard']['search'] = array('id', 'joomla_component', 'php_dashboard_methods','dashboard_tab');
-		$targets['component_dashboard']['view'] = 'components_dashboard';
-		$targets['component_dashboard']['not_base64'] = array('dashboard_tab' => 'json');
-		$targets['component_dashboard']['name'] = 'joomla_component->id:joomla_component.system_name';
-
-		// #__componentbuilder_admin_view
-		$targets['admin_view'] = array();
-		$targets['admin_view']['search'] = array('id', 'system_name', 'javascript_view_file','javascript_view_footer',
-			'javascript_views_file','javascript_views_footer','html_import_view',
-			'php_after_delete','php_after_publish','php_ajaxmethod','php_allowedit','php_batchcopy',
-			'php_batchmove','php_before_delete','php_before_publish','php_before_save','php_controller',
-			'php_controller_list','php_document','php_getitem','php_getitems','php_getitems_after_all',
-			'php_getlistquery','php_import','php_import_display','php_import_ext','php_import_headers','php_getform',
-			'php_import_save','php_import_setdata','php_model','php_model_list','php_postsavehook','php_save');
-		$targets['admin_view']['view'] = 'admin_views';
-		$targets['admin_view']['not_base64'] = array();
-		$targets['admin_view']['name'] = 'system_name';
-
-		// #__componentbuilder_admin_fields_relations
-		$targets['library'] = array();
-		$targets['library']['search'] = array('id', 'admin_view', 'addrelations');
-		$targets['library']['view'] = 'admin_fields_relations';
-		$targets['library']['not_base64'] = array('addrelations' => 'json');
-		$targets['library']['name'] = 'admin_view->id:admin_view.system_name';
-
-		// #__componentbuilder_custom_admin_view
-		$targets['custom_admin_view'] = array();
-		$targets['custom_admin_view']['search'] = array('id', 'system_name', 'default','php_view','php_jview','php_jview_display','php_document',
-			'js_document','css_document','css','php_ajaxmethod','php_model','php_controller');
-		$targets['custom_admin_view']['view'] = 'custom_admin_views';
-		$targets['custom_admin_view']['not_base64'] = array();
-		$targets['custom_admin_view']['name'] = 'system_name';
-
-		// #__componentbuilder_site_view
-		$targets['site_view'] = array();
-		$targets['site_view']['search'] = array('id', 'system_name', 'default','php_view','php_jview','php_jview_display','php_document',
-			'js_document','css_document','css','php_ajaxmethod','php_model','php_controller');
-		$targets['site_view']['view'] = 'site_views';
-		$targets['site_view']['not_base64'] = array();
-		$targets['site_view']['name'] = 'system_name';
-
-		// #__componentbuilder_field
-		$targets['field'] = array();
-		$targets['field']['search'] = array('id', 'name', 'xml','javascript_view_footer','javascript_views_footer');
-		$targets['field']['view'] = 'fields';
-		$targets['field']['not_base64'] = array('xml' => 'json');
-		$targets['field']['name'] = 'name';
-
-		// #__componentbuilder_dynamic_get
-		$targets['dynamic_get'] = array();
-		$targets['dynamic_get']['search'] = array('id', 'name', 'php_before_getitem','php_after_getitem','php_before_getitems','php_after_getitems',
-			'php_getlistquery');
-		$targets['dynamic_get']['view'] = 'dynamic_gets';
-		$targets['dynamic_get']['not_base64'] = array();
-		$targets['dynamic_get']['name'] = 'name';
-
-		// #__componentbuilder_template
-		$targets['template'] = array();
-		$targets['template']['search'] = array('id', 'name', 'php_view','template');
-		$targets['template']['view'] = 'templates';
-		$targets['template']['not_base64'] = array();
-		$targets['template']['name'] = 'name';
-
-		// #__componentbuilder_layout
-		$targets['layout'] = array();
-		$targets['layout']['search'] = array('id', 'name', 'php_view','layout');
-		$targets['layout']['view'] = 'layouts';
-		$targets['layout']['not_base64'] = array();
-		$targets['layout']['name'] = 'name';
-
-		// #__componentbuilder_library
-		$targets['library'] = array();
-		$targets['library']['search'] = array('id', 'name', 'php_setdocument');
-		$targets['library']['view'] = 'libraries';
-		$targets['library']['not_base64'] = array();
-		$targets['library']['name'] = 'name';
-
 		// return result ready for a.query
-		if ('query' === $type && isset($targets[$target]))
+		if ('query' === $type && isset($this->codeSearchKeys[$target]))
 		{
+			// set the targets
+			$codeSearchTarget = $this->codeSearchKeys[$target];
 			// add the .a to the selection array
-			$targets[$target]['select'] = array_map( function($select) { return 'a.'.$select; }, $targets[$target]['search']);
+			$codeSearchTarget['select'] = array_map( function($select) { return 'a.' . $select; }, $codeSearchTarget['search']);
 			// also set the table
-			$targets[$target]['table'] = $target;
+			$codeSearchTarget['table'] = $target;
 			// remove search
-			unset($targets[$target]['search']);
+			unset($codeSearchTarget['search']);
-			// return
+			// return targeted array to use in query
-			return $targets[$target];
+			return $codeSearchTarget;
 		}
-		// return the query string to search
+		// does the target exist
-		elseif (isset($targets[$target]))
+		elseif (isset($this->codeSearchKeys[$target]))
 		{
-			// remove name and id
+			// return target array values to use in search
-			return $targets[$target];
+			return $this->codeSearchKeys[$target];
 		}
 		return false;
 	}
 
+
 	// Used in validation_rule
 	public function getExistingValidationRuleCode($name)
 	{

admin/models/componentbuilder.php

@@ -441,9 +441,8 @@ class ComponentbuilderModelComponentbuilder extends JModelList
 
 	public function getWiki()
 	{
-		$document = JFactory::getDocument();
+		JFactory::getDocument()->addScriptDeclaration('
-		$document->addScriptDeclaration('
+		var gewiki = "'. JURI::root() . 'administrator/components/com_componentbuilder/wiki_menu.txt";
-		var gewiki = "https://raw.githubusercontent.com/wiki/vdm-io/Joomla-Component-Builder/Home.md";
 		jQuery(document).ready(function () {
 			jQuery.get(gewiki)
 			.success(function(wiki) { 
@@ -454,11 +453,10 @@ class ComponentbuilderModelComponentbuilder extends JModelList
 			});
 		});');
 
-		return '<div id="wiki-md"><small>'.JText::_('COM_COMPONENTBUILDER_THE_WIKI_IS_LOADING').'.<span class="loading-dots">.</span></small></div>';
+		return '<div id="wiki-md"><small>'.JText::_('COM_COMPONENTBUILDER_THE_TEXT_IS_LOADING').'.<span class="loading-dots">.</span></small></div>';
 	}
 
 
-
 	public function getNoticeboard()
 	{
 		// get the document to load the scripts

admin/models/field.php

@@ -907,10 +907,12 @@ class ComponentbuilderModelField extends JModelAdmin
 		$properties = $input->get('properties', null, 'ARRAY');
 		// get the extra properties
 		$extraproperties = $input->get('extraproperties', null, 'ARRAY');
-		// get the type phpx property
-		$typephpx = $input->get('property_type_phpx', null, 'RAW');
 		// get the type php property
-		$typephp = $input->get('property_type_php', null, 'RAW');
+		$typephp = array();
+		foreach (ComponentbuilderHelper::$phpFieldArray as $x)
+		{
+			$typephp[$x] = $input->get('property_type_php' . $x, null, 'RAW');
+		}
 		// make sure we have an array
 		if (ComponentbuilderHelper::checkArray($properties))
 		{
@@ -919,7 +921,7 @@ class ComponentbuilderModelField extends JModelAdmin
 			foreach($properties as $property)
 			{
 				// make sure we have the correct values
-				if (ComponentbuilderHelper::checkArray($property) && isset($property['name']) && ComponentbuilderHelper::checkString($property['name']) && isset($property['value']))
+				if (ComponentbuilderHelper::checkArray($property) && isset($property['name']) && ComponentbuilderHelper::checkString($property['name']) && (isset($property['value']) || 'default' === $property['name']))
 				{
 					// fix the name (TODO)
 					// $property['name'] = ComponentbuilderHelper::safeString($property['name']);
@@ -933,7 +935,7 @@ class ComponentbuilderModelField extends JModelAdmin
 						break;
 					}
 					// load the property
-					$bucket[] = "\t".$property['name'].'="'. str_replace('"', """, $property['value']).'"';
+					$bucket[] = "\t" . $property['name'] . '="' . str_replace('"', """, $property['value']) . '"';
 				}
 			}
 			// make sure we have an array
@@ -945,26 +947,24 @@ class ComponentbuilderModelField extends JModelAdmin
 					if (ComponentbuilderHelper::checkArray($xproperty) && isset($xproperty['name']) && ComponentbuilderHelper::checkString($xproperty['name']) && isset($xproperty['value']))
 					{
 						// load the extra property
-						$bucket[] = "\t".ComponentbuilderHelper::safeString($xproperty['name']).'="'. str_replace('"', """, $xproperty['value']).'"';
+						$bucket[] = "\t" . ComponentbuilderHelper::safeString($xproperty['name']) . '="' . str_replace('"', """, $xproperty['value']) . '"';
 					}
 				}
 			}
-			// make sure we have a string
+			// load the PHP
-			if (ComponentbuilderHelper::checkString($typephp))
+			foreach ($typephp as $x => $phpvalue)
 			{
-				// load the type_php property
+				// make sure we have a string
-				$bucket[] = "\t".'type_php_1="'. str_replace('"', "'", $typephp).'"';
+				if (ComponentbuilderHelper::checkString($phpvalue))
-			}
+				{
-			// make sure we have a string
+					// load the type_php property
-			if (ComponentbuilderHelper::checkString($typephpx))
+					$bucket[] = "\t" . 'type_php' . $x . '_1="__.o0=base64=Oo.__' . base64_encode($phpvalue) . '"';
-			{
+				}
-				// load the type_phpx property
-				$bucket[] = "\t".'type_phpx_1="'. str_replace('"', "'", $typephpx).'"';
 			}
 			// if the bucket has been loaded
 			if (ComponentbuilderHelper::checkArray($bucket))
 			{
-				$data['xml'] = "<field".PHP_EOL.implode(PHP_EOL, $bucket).PHP_EOL."/>";
+				$data['xml'] = "<field" . PHP_EOL . implode(PHP_EOL, $bucket) . PHP_EOL . "/>";
 			}
 		}
 

admin/models/fields/adminsviews.php

@@ -31,9 +31,9 @@ class JFormFieldAdminsviews extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);

admin/models/fields/adminviewfolderlist.php

@@ -31,9 +31,9 @@ class JFormFieldAdminviewfolderlist extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		// get custom folder files
 		$localfolder = JPATH_COMPONENT_ADMINISTRATOR.'/views';

admin/models/fields/adminviews.php

@@ -31,27 +31,28 @@ class JFormFieldAdminviews extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
+$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.system_name'),array('id','adminview_system_name')));
+$query->select($db->quoteName(array('a.id','a.system_name'),array('id','adminview_system_name')));
-		$query->from($db->quoteName('#__componentbuilder_admin_view', 'a'));
+$query->from($db->quoteName('#__componentbuilder_admin_view', 'a'));
-		$query->where($db->quoteName('a.published') . ' >= 1');
+$query->where($db->quoteName('a.published') . ' >= 1');
-		$query->order('a.system_name ASC');
+$query->order('a.system_name ASC');
-		$db->setQuery((string)$query);
+$db->setQuery((string)$query);
-		$items = $db->loadObjectList();
+$items = $db->loadObjectList();
-		$options = array();
+$options = array();
-		if ($items)
+if ($items)
-		{
+{
-			$options[] = JHtml::_('select.option', '', 'Select an option');
+	$options[] = JHtml::_('select.option', '', 'Select an option');
-			foreach($items as $item)
+	foreach($items as $item)
-			{
+	{
-				$options[] = JHtml::_('select.option', $item->id, $item->adminview_system_name);
+		$options[] = JHtml::_('select.option', $item->id, $item->adminview_system_name);
-			}
+	}
-		}
+}
-		return $options;
+
+return $options;
 	}
 }

admin/models/fields/adminviewsreadonly.php

@@ -31,9 +31,9 @@ class JFormFieldAdminviewsreadonly extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 $query = $db->getQuery(true);

admin/models/fields/aliasbuilder.php

@@ -31,9 +31,9 @@ class JFormFieldAliasbuilder extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		// load the db object
 		$db = JFactory::getDBO();		

admin/models/fields/articles.php

@@ -31,9 +31,9 @@ class JFormFieldArticles extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);

admin/models/fields/component.php

@@ -138,9 +138,9 @@ class JFormFieldComponent extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 $query = $db->getQuery(true);

admin/models/fields/componentadminmenus.php

@@ -31,9 +31,9 @@ class JFormFieldComponentadminmenus extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		// load the db opbject
 		$db = JFactory::getDBO();		

admin/models/fields/componentadminviews.php

@@ -31,9 +31,9 @@ class JFormFieldComponentadminviews extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		// load the db opbject
 		$db = JFactory::getDBO();		

admin/models/fields/components.php

@@ -31,9 +31,9 @@ class JFormFieldComponents extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);

admin/models/fields/customadminviews.php

@@ -31,9 +31,9 @@ class JFormFieldCustomadminviews extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);

admin/models/fields/customfilelist.php

@@ -31,9 +31,9 @@ class JFormFieldCustomfilelist extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		// get custom folder files
 		$localfolder = JComponentHelper::getParams('com_componentbuilder')->get('custom_folder_path', JPATH_COMPONENT_ADMINISTRATOR.'/custom');

admin/models/fields/customfolderlist.php

@@ -31,9 +31,9 @@ class JFormFieldCustomfolderlist extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		// get custom folder folder
 		$localfolder = JComponentHelper::getParams('com_componentbuilder')->get('custom_folder_path', JPATH_COMPONENT_ADMINISTRATOR.'/custom');

admin/models/fields/customgets.php

@@ -31,9 +31,9 @@ class JFormFieldCustomgets extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);

admin/models/fields/dbtables.php

@@ -31,9 +31,9 @@ class JFormFieldDbtables extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 		$tables= $db->getTableList();

admin/models/fields/dynamicdashboard.php

@@ -31,9 +31,9 @@ class JFormFieldDynamicdashboard extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		// load the db opbject
 		$db = JFactory::getDBO();		

admin/models/fields/dynamicget.php

@@ -138,9 +138,9 @@ class JFormFieldDynamicget extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);

admin/models/fields/dynamicgets.php

@@ -31,9 +31,9 @@ class JFormFieldDynamicgets extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);

admin/models/fields/existingvalidationrules.php

@@ -31,9 +31,9 @@ class JFormFieldExistingvalidationrules extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		// get the existing validation rules names
 		if ($items = ComponentbuilderHelper::getExistingValidationRuleNames())

admin/models/fields/fields.php

@@ -31,9 +31,9 @@ class JFormFieldFields extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 $query = $db->getQuery(true);

admin/models/fields/fieldtypes.php

@@ -138,27 +138,28 @@ class JFormFieldFieldtypes extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
+$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.name'),array('id','fieldtype_name')));
+$query->select($db->quoteName(array('a.id','a.name'),array('id','fieldtype_name')));
-		$query->from($db->quoteName('#__componentbuilder_fieldtype', 'a'));
+$query->from($db->quoteName('#__componentbuilder_fieldtype', 'a'));
-		$query->where($db->quoteName('a.published') . ' = 1');
+$query->where($db->quoteName('a.published') . ' = 1');
-		$query->order('a.name ASC');
+$query->order('a.name ASC');
-		$db->setQuery((string)$query);
+$db->setQuery((string)$query);
-		$items = $db->loadObjectList();
+$items = $db->loadObjectList();
-		$options = array();
+$options = array();
-		if ($items)
+if ($items)
-		{
+{
-			$options[] = JHtml::_('select.option', '', 'Select an option');
+	$options[] = JHtml::_('select.option', '', 'Select an option');
-			foreach($items as $item)
+	foreach($items as $item)
-			{
+	{
-				$options[] = JHtml::_('select.option', $item->id, $item->fieldtype_name);
+		$options[] = JHtml::_('select.option', $item->id, $item->fieldtype_name);
-			}
+	}
-		}
+}
-		return $options;
+
+return $options;
 	}
 }

admin/models/fields/filebehaviour.php

@@ -31,9 +31,9 @@ class JFormFieldFilebehaviour extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		// get the input from url
 		$jinput = JFactory::getApplication()->input;

admin/models/fields/joinfields.php

@@ -31,9 +31,9 @@ class JFormFieldJoinfields extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		// load the db opbject
 		$db = JFactory::getDBO();		

admin/models/fields/joomlacomponents.php

@@ -31,9 +31,9 @@ class JFormFieldJoomlacomponents extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 $query = $db->getQuery(true);

admin/models/fields/lang.php

@@ -31,9 +31,9 @@ class JFormFieldLang extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 $query = $db->getQuery(true);

admin/models/fields/libconfigfield.php

@@ -31,9 +31,9 @@ class JFormFieldLibconfigfield extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		// load the db opbject
 		$db = JFactory::getDBO();		

admin/models/fields/libraries.php

@@ -138,9 +138,9 @@ class JFormFieldLibraries extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);

admin/models/fields/librariesx.php

@@ -138,9 +138,9 @@ class JFormFieldLibrariesx extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		// get the input from url
 		$jinput = JFactory::getApplication()->input;

admin/models/fields/library.php

@@ -138,9 +138,9 @@ class JFormFieldLibrary extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);

admin/models/fields/libraryfiles.php

@@ -31,9 +31,9 @@ class JFormFieldLibraryfiles extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		// get the input from url
 		$jinput = JFactory::getApplication()->input;

admin/models/fields/libraryreadonly.php

@@ -31,9 +31,9 @@ class JFormFieldLibraryreadonly extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);

admin/models/fields/listfields.php

@@ -31,9 +31,9 @@ class JFormFieldListfields extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		// load the db opbject
 		$db = JFactory::getDBO();		

admin/models/fields/maingets.php

@@ -138,9 +138,9 @@ class JFormFieldMaingets extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);

admin/models/fields/matchfield.php

@@ -31,9 +31,9 @@ class JFormFieldMatchfield extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		// load the db opbject
 		$db = JFactory::getDBO();		

admin/models/fields/servers.php

@@ -138,9 +138,9 @@ class JFormFieldServers extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);

admin/models/fields/siteviewfolderlist.php

@@ -31,9 +31,9 @@ class JFormFieldSiteviewfolderlist extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		// get custom folder files
 		$localfolder = JPATH_COMPONENT_SITE.'/views';

admin/models/fields/siteviews.php

@@ -31,9 +31,9 @@ class JFormFieldSiteviews extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);

admin/models/fields/snippets.php

@@ -138,9 +138,9 @@ class JFormFieldSnippets extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);

admin/models/fields/snippettype.php

@@ -31,9 +31,9 @@ class JFormFieldSnippettype extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
 		$query = $db->getQuery(true);

admin/models/fields/targetfields.php

@@ -31,9 +31,9 @@ class JFormFieldTargetfields extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 		// load the db opbject
 		$db = JFactory::getDBO();		

admin/models/fields/viewtabs.php

@@ -31,9 +31,9 @@ class JFormFieldViewtabs extends JFormFieldList
 	/**
 	 * Method to get a list of options for a list input.
 	 *
-	 * @return	array		An array of JHtml options.
+	 * @return	array    An array of JHtml options.
 	 */
-	public function getOptions()
+	protected function getOptions()
 	{
 				// get the input from url
 		$jinput = JFactory::getApplication()->input;

admin/models/fieldtype.php

@@ -376,6 +376,74 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 			// Disable fields while saving.
 			$form->setFieldAttribute('created', 'filter', 'unset');
 		}
+		// Modify the form based on Edit Name access controls.
+		if ($id != 0 && (!$user->authorise('fieldtype.edit.name', 'com_componentbuilder.fieldtype.' . (int) $id))
+			|| ($id == 0 && !$user->authorise('fieldtype.edit.name', 'com_componentbuilder')))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('name', 'disabled', 'true');
+			// Disable fields for display.
+			$form->setFieldAttribute('name', 'readonly', 'true');
+			// If there is no value continue.
+			if (!$form->getValue('name'))
+			{
+				// Disable fields while saving.
+				$form->setFieldAttribute('name', 'filter', 'unset');
+				// Disable fields while saving.
+				$form->setFieldAttribute('name', 'required', 'false');
+			}
+		}
+		// Modify the form based on Edit Properties access controls.
+		if ($id != 0 && (!$user->authorise('fieldtype.edit.properties', 'com_componentbuilder.fieldtype.' . (int) $id))
+			|| ($id == 0 && !$user->authorise('fieldtype.edit.properties', 'com_componentbuilder')))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('properties', 'disabled', 'true');
+			// Disable fields for display.
+			$form->setFieldAttribute('properties', 'readonly', 'true');
+			// If there is no value continue.
+			if (!$form->getValue('properties'))
+			{
+				// Disable fields while saving.
+				$form->setFieldAttribute('properties', 'filter', 'unset');
+				// Disable fields while saving.
+				$form->setFieldAttribute('properties', 'required', 'false');
+			}
+		}
+		// Modify the form based on Edit Description access controls.
+		if ($id != 0 && (!$user->authorise('fieldtype.edit.description', 'com_componentbuilder.fieldtype.' . (int) $id))
+			|| ($id == 0 && !$user->authorise('fieldtype.edit.description', 'com_componentbuilder')))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('description', 'disabled', 'true');
+			// Disable fields for display.
+			$form->setFieldAttribute('description', 'readonly', 'true');
+			// If there is no value continue.
+			if (!$form->getValue('description'))
+			{
+				// Disable fields while saving.
+				$form->setFieldAttribute('description', 'filter', 'unset');
+				// Disable fields while saving.
+				$form->setFieldAttribute('description', 'required', 'false');
+			}
+		}
+		// Modify the form based on Edit Short Description access controls.
+		if ($id != 0 && (!$user->authorise('fieldtype.edit.short_description', 'com_componentbuilder.fieldtype.' . (int) $id))
+			|| ($id == 0 && !$user->authorise('fieldtype.edit.short_description', 'com_componentbuilder')))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('short_description', 'disabled', 'true');
+			// Disable fields for display.
+			$form->setFieldAttribute('short_description', 'readonly', 'true');
+			// If there is no value continue.
+			if (!$form->getValue('short_description'))
+			{
+				// Disable fields while saving.
+				$form->setFieldAttribute('short_description', 'filter', 'unset');
+				// Disable fields while saving.
+				$form->setFieldAttribute('short_description', 'required', 'false');
+			}
+		}
 		// Only load these values if no id is found
 		if (0 == $id)
 		{

admin/models/forms/admin_custom_tabs.xml

@@ -93,6 +93,7 @@
 			description="COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_ADMIN_VIEW_DESCRIPTION"
 			class="list_class"
 			multiple="false"
+			default=""
 			required="true"
 			readonly="true"
 			button="false"
@@ -170,6 +171,7 @@
 					label="COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_HTML_LABEL"
 					rows="20"
 					cols="30"
+					default=""
 					class="text_area tab_html"
 					filter="raw"
 					hint="COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_HTML_HINT"

admin/models/forms/admin_fields.xml

@@ -93,6 +93,7 @@
 			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ADMIN_VIEW_DESCRIPTION"
 			class="list_class"
 			multiple="false"
+			default=""
 			required="true"
 			readonly="true"
 			button="false"
@@ -105,6 +106,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ADDFIELDS_DESCRIPTION"
+			default=""
 			icon="list"
 			min="1">
 			<form hidden="true" name="list_addfields_modal" repeat="true">
@@ -116,6 +118,7 @@
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_DESCRIPTION"
 					class="list_class fieldFull"
 					multiple="false"
+					default=""
 					required="false"
 					button="false"
 				/>
@@ -156,6 +159,7 @@
 					name="title"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_TITLE_LABEL"
 					value="1"
+					default=""
 					required="false"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_TITLE_DESCRIPTION"
 					class="inputbox"
@@ -167,6 +171,7 @@
 					name="alias"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ALIAS_LABEL"
 					value="1"
+					default=""
 					required="false"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ALIAS_DESCRIPTION"
 					class="inputbox"
@@ -178,6 +183,7 @@
 					name="sort"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_SORT_LABEL"
 					value="1"
+					default=""
 					required="false"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_SORT_DESCRIPTION"
 					class="inputbox"
@@ -188,6 +194,7 @@
 					name="search"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_SEARCH_LABEL"
 					value="1"
+					default=""
 					required="false"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_SEARCH_DESCRIPTION"
 					class="inputbox"
@@ -198,6 +205,7 @@
 					name="filter"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_FILTER_LABEL"
 					value="1"
+					default=""
 					required="false"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_FILTER_DESCRIPTION"
 					class="inputbox"
@@ -208,6 +216,7 @@
 					name="link"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_LINK_LABEL"
 					value="1"
+					default=""
 					required="false"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_LINK_DESCRIPTION"
 					class="inputbox"

admin/models/forms/admin_fields_conditions.xml

@@ -93,6 +93,7 @@
 			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ADMIN_VIEW_DESCRIPTION"
 			class="list_class"
 			multiple="false"
+			default=""
 			required="true"
 			readonly="true"
 			button="false"
@@ -105,6 +106,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ADDCONDITIONS_DESCRIPTION"
+			default=""
 			icon="list">
 			<form hidden="true" name="list_addconditions_modal" repeat="true">
 				<!-- Target_field Field. Type: Targetfields. (custom) -->
@@ -115,6 +117,7 @@
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_FIELD_DESCRIPTION"
 					class="fieldMedium"
 					multiple="true"
+					default=""
 					required="false"
 					button="false"
 				/>
@@ -163,6 +166,7 @@
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_FIELD_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_FIELD_DESCRIPTION"
 					multiple="false"
+					default=""
 					required="false"
 					button="false"
 				/>

admin/models/forms/admin_fields_relations.xml

@@ -93,6 +93,7 @@
 			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_ADMIN_VIEW_DESCRIPTION"
 			class="list_class"
 			multiple="false"
+			default=""
 			required="true"
 			readonly="true"
 			button="false"
@@ -105,6 +106,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_ADDRELATIONS_DESCRIPTION"
+			default=""
 			icon="list">
 			<form hidden="true" name="list_addrelations_modal" repeat="true">
 				<!-- Listfield Field. Type: Listfields. (custom) -->
@@ -115,6 +117,7 @@
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_LISTFIELD_DESCRIPTION"
 					class="fieldMedium"
 					multiple="false"
+					default=""
 					required="false"
 					onchange="getCodeGlueOptions(this)"
 					button="false"
@@ -142,6 +145,7 @@
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_JOINFIELDS_DESCRIPTION"
 					class="fieldMedium"
 					multiple="true"
+					default=""
 					required="false"
 					onchange="getCodeGlueOptions(this)"
 					button="false"

admin/models/forms/component_admin_views.xml

@@ -93,6 +93,7 @@
 			description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
 			multiple="false"
+			default=""
 			required="true"
 			readonly="true"
 			button="false"
@@ -105,6 +106,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADDADMIN_VIEWS_DESCRIPTION"
+			default=""
 			icon="list"
 			min="1">
 			<form hidden="true" name="list_addadmin_views_modal" repeat="true">
@@ -116,6 +118,7 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADMINVIEW_DESCRIPTION"
 					class="fieldMedium"
 					multiple="false"
+					default=""
 					required="false"
 					button="false"
 				/>
@@ -127,7 +130,8 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ICOMOON_DESCRIPTION"
 					class="list_class fieldMedium"
 					multiple="false"
-					required="false">
+					required="false"
+					default="">
 					<!-- Option Set. -->
 					<option value="joomla">
 						COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_JOOMLA</option>
@@ -567,6 +571,7 @@
 					name="dashboard_add"
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_DASHBOARD_ADD_LABEL"
 					value="1"
+					default=""
 					required="false"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_DASHBOARD_ADD_DESCRIPTION"
 					class="inputbox"
@@ -654,6 +659,7 @@
 					name="port"
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_PORT_LABEL"
 					value="1"
+					default=""
 					required="false"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_PORT_DESCRIPTION"
 					class="inputbox"
@@ -664,6 +670,7 @@
 					name="edit_create_site_view"
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_EDIT_CREATE_SITE_VIEW_LABEL"
 					value="1"
+					default=""
 					required="false"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_EDIT_CREATE_SITE_VIEW_DESCRIPTION"
 					class="inputbox"

admin/models/forms/component_config.xml

@@ -93,6 +93,7 @@
 			description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
 			multiple="false"
+			default=""
 			required="true"
 			readonly="true"
 			button="false"
@@ -105,6 +106,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_ADDCONFIG_DESCRIPTION"
+			default=""
 			icon="list">
 			<form hidden="true" name="list_addconfig_modal" repeat="true">
 				<!-- Field Field. Type: Fields. (custom) -->
@@ -115,6 +117,7 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_DESCRIPTION"
 					class="list_class fieldFull"
 					multiple="false"
+					default=""
 					required="false"
 					button="false"
 				/>

admin/models/forms/component_custom_admin_menus.xml

@@ -93,6 +93,7 @@
 			description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
 			multiple="false"
+			default=""
 			required="true"
 			readonly="true"
 			button="false"
@@ -104,6 +105,7 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_ADDCUSTOMMENUS_LABEL"
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
+			default=""
 			icon="list">
 			<form hidden="true" name="list_addcustommenus_modal" repeat="true">
 				<!-- Name Field. Type: Text. (joomla) -->
@@ -129,6 +131,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_CODE_LABEL"
 					size="40"
 					maxlength="50"
+					default=""
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_CODE_DESCRIPTION"
 					class="text_area"
 					required="false"
@@ -158,6 +161,7 @@
 					name="icon"
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_ICON_LABEL"
 					directory="images"
+					default=""
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_ICON_DESCRIPTION"
 					hide_default="true"
 				/>
@@ -202,6 +206,7 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_BEFORE_DESCRIPTION"
 					class="list_class fieldMedium"
 					multiple="false"
+					default=""
 					required="false"
 					button="false"
 				/>

admin/models/forms/component_custom_admin_views.xml

@@ -93,6 +93,7 @@
 			description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
 			multiple="false"
+			default=""
 			required="true"
 			readonly="true"
 			button="false"
@@ -104,6 +105,7 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ADDCUSTOM_ADMIN_VIEWS_LABEL"
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
+			default=""
 			icon="list">
 			<form hidden="true" name="list_addcustom_admin_views_modal" repeat="true">
 				<!-- Customadminview Field. Type: Customadminviews. (custom) -->
@@ -114,6 +116,7 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CUSTOMADMINVIEW_DESCRIPTION"
 					class="fieldMedium"
 					multiple="false"
+					default=""
 					required="false"
 					button="false"
 				/>
@@ -125,7 +128,8 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ICOMOON_DESCRIPTION"
 					class="list_class fieldMedium"
 					multiple="false"
-					required="false">
+					required="false"
+					default="">
 					<!-- Option Set. -->
 					<option value="joomla">
 						COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_JOOMLA</option>
@@ -611,6 +615,7 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ADMINVIEWS_DESCRIPTION"
 					class="fieldMedium"
 					multiple="true"
+					default=""
 					required="false"
 					button="false"
 				/>
@@ -622,6 +627,7 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_BEFORE_DESCRIPTION"
 					class="list_class fieldMedium"
 					multiple="false"
+					default=""
 					required="false"
 					button="false"
 				/>

admin/models/forms/component_dashboard.xml

@@ -93,6 +93,7 @@
 			description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
 			multiple="false"
+			default=""
 			required="true"
 			readonly="true"
 			button="false"
@@ -104,6 +105,7 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_DASHBOARD_TAB_LABEL"
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
+			default=""
 			icon="list"
 			filter="raw">
 			<form hidden="true" name="list_dashboard_tab_modal" repeat="true">
@@ -146,6 +148,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HTML_LABEL"
 					rows="20"
 					cols="30"
+					default=""
 					class="text_area tab_html"
 					filter="raw"
 					hint="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HTML_HINT"

admin/models/forms/component_files_folders.xml

@@ -93,6 +93,7 @@
 			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
 			multiple="false"
+			default=""
 			required="true"
 			readonly="true"
 			button="false"
@@ -107,6 +108,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFOLDERSFULLPATH_DESCRIPTION"
+			default=""
 			icon="list">
 			<form hidden="true" name="list_addfoldersfullpath_modal" repeat="true">
 				<!-- Folderpath Field. Type: Text. (joomla) -->
@@ -116,6 +118,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FOLDERPATH_LABEL"
 					size="70"
 					maxlength="300"
+					default=""
 					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FOLDERPATH_DESCRIPTION"
 					class="text_area"
 					required="false"
@@ -145,6 +148,7 @@
 					name="rename"
 					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_RENAME_LABEL"
 					value="1"
+					default=""
 					required="false"
 					class="inputbox"
 				/>
@@ -160,6 +164,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFILESFULLPATH_DESCRIPTION"
+			default=""
 			icon="list">
 			<form hidden="true" name="list_addfilesfullpath_modal" repeat="true">
 				<!-- Filepath Field. Type: Text. (joomla) -->
@@ -169,6 +174,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FILEPATH_LABEL"
 					size="70"
 					maxlength="300"
+					default=""
 					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FILEPATH_DESCRIPTION"
 					class="text_area"
 					required="false"
@@ -198,6 +204,7 @@
 					name="notnew"
 					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_LABEL"
 					value="1"
+					default=""
 					required="false"
 					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_DESCRIPTION"
 					class="inputbox"
@@ -214,6 +221,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFOLDERS_DESCRIPTION"
+			default=""
 			icon="list">
 			<form hidden="true" name="list_addfolders_modal" repeat="true">
 				<!-- Folder Field. Type: Customfolderlist. (custom) -->
@@ -250,6 +258,7 @@
 					name="rename"
 					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_RENAME_LABEL"
 					value="1"
+					default=""
 					required="false"
 					class="inputbox"
 				/>
@@ -265,6 +274,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFILES_DESCRIPTION"
+			default=""
 			icon="list">
 			<form hidden="true" name="list_addfiles_modal" repeat="true">
 				<!-- File Field. Type: Customfilelist. (custom) -->
@@ -301,6 +311,7 @@
 					name="notnew"
 					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_LABEL"
 					value="1"
+					default=""
 					required="false"
 					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_DESCRIPTION"
 					class="inputbox"

admin/models/forms/component_mysql_tweaks.xml

@@ -93,6 +93,7 @@
 			description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
 			multiple="false"
+			default=""
 			required="true"
 			readonly="true"
 			button="false"
@@ -105,6 +106,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_SQL_TWEAK_DESCRIPTION"
+			default=""
 			icon="list">
 			<form hidden="true" name="list_sql_tweak_modal" repeat="true">
 				<!-- Adminview Field. Type: Componentadminviews. (custom) -->
@@ -115,6 +117,7 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ADMINVIEW_DESCRIPTION"
 					class="list_class fieldMedium"
 					multiple="false"
+					default=""
 					required="false"
 					button="false"
 				/>
@@ -144,7 +147,8 @@
 					class="list_class"
 					multiple="false"
 					filter="INT"
-					required="false">
+					required="false"
+					default="">
 					<!-- Option Set. -->
 					<option value="">
 						COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_SELECT_AN_OPTION</option>
@@ -160,6 +164,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_IDS_LABEL"
 					rows="20"
 					cols="40"
+					default=""
 					description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_IDS_DESCRIPTION"
 					class="text_area ids_selection"
 					filter="raw"

admin/models/forms/component_site_views.xml

@@ -93,6 +93,7 @@
 			description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
 			multiple="false"
+			default=""
 			required="true"
 			readonly="true"
 			button="false"
@@ -105,6 +106,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ADDSITE_VIEWS_DESCRIPTION"
+			default=""
 			icon="list">
 			<form hidden="true" name="list_addsite_views_modal" repeat="true">
 				<!-- Siteview Field. Type: Siteviews. (custom) -->
@@ -115,6 +117,7 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_DESCRIPTION"
 					class="fieldMedium"
 					multiple="false"
+					default=""
 					required="false"
 					button="false"
 				/>
@@ -146,6 +149,7 @@
 					name="default_view"
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_DEFAULT_VIEW_LABEL"
 					value="1"
+					default=""
 					required="false"
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_DEFAULT_VIEW_DESCRIPTION"
 					class="inputbox"
@@ -167,6 +171,7 @@
 					name="public_access"
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_PUBLIC_ACCESS_LABEL"
 					value="1"
+					default=""
 					required="false"
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_PUBLIC_ACCESS_DESCRIPTION"
 					class="inputbox"

admin/models/forms/component_updates.xml

@@ -93,6 +93,7 @@
 			description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_JOOMLA_COMPONENT_DESCRIPTION"
 			class="list_class"
 			multiple="false"
+			default=""
 			required="true"
 			readonly="true"
 			button="false"
@@ -105,6 +106,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_UPDATE_DESCRIPTION"
+			default=""
 			icon="list">
 			<form hidden="true" name="list_version_update_modal" repeat="true">
 				<!-- Version Field. Type: Text. (joomla) -->
@@ -114,6 +116,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_LABEL"
 					size="10"
 					maxlength="50"
+					default=""
 					description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_DESCRIPTION"
 					class="text_area"
 					readonly="false"
@@ -130,6 +133,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MYSQL_LABEL"
 					rows="30"
 					cols="15"
+					default=""
 					description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MYSQL_DESCRIPTION"
 					class="text_area mysql_update"
 					filter="raw"
@@ -143,6 +147,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_URL_LABEL"
 					size="60"
 					maxlength="150"
+					default=""
 					description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_URL_DESCRIPTION"
 					class="text_area version_url"
 					required="false"

admin/models/forms/custom_admin_view.xml

@@ -92,6 +92,7 @@
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SYSTEM_NAME_LABEL"
 			size="10"
 			maxlength="50"
+			default=""
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SYSTEM_NAME_DESCRIPTION"
 			class="text_area"
 			filter="STRING"
@@ -137,6 +138,7 @@
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_LABEL"
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_DESCRIPTION"
 			multiple="false"
+			default=""
 			required="true"
 			button="true"
 		/>
@@ -318,6 +320,7 @@
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_LABEL"
 			size="80"
 			maxlength="150"
+			default=""
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_DESCRIPTION"
 			class="text_area"
 			filter="CMD"
@@ -331,6 +334,7 @@
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_LABEL"
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_DESCRIPTION"
 			multiple="true"
+			default=""
 		/>
 		<!-- Js_document Field. Type: Editor. (joomla) -->
 		<field
@@ -387,6 +391,7 @@
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_AJAX_INPUT_LABEL"
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
+			default=""
 			icon="list">
 			<form hidden="true" name="list_ajax_input_modal" repeat="true">
 				<!-- Value_name Field. Type: Text. (joomla) -->
@@ -598,6 +603,7 @@
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_LABEL"
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_DESCRIPTION"
 			multiple="false"
+			default=""
 			required="false"
 		/>
 		<!-- Add_php_document Field. Type: Radio. (joomla) -->
@@ -676,7 +682,8 @@
 					description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICOMOON_DESCRIPTION"
 					class="list_class fieldMedium"
 					multiple="false"
-					required="false">
+					required="false"
+					default="">
 					<!-- Option Set. -->
 					<option value="joomla">
 						COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JOOMLA</option>
@@ -1122,6 +1129,7 @@
 					label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_LABEL"
 					size="40"
 					maxlength="50"
+					default=""
 					description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_DESCRIPTION"
 					class="text_area"
 					required="false"