diff --git a/src/admin/language/en-GB/en-GB.com_kunena.install.ini b/src/admin/language/en-GB/en-GB.com_kunena.install.ini
index 9478d937ed6..fe767738909 100644
--- a/src/admin/language/en-GB/en-GB.com_kunena.install.ini
+++ b/src/admin/language/en-GB/en-GB.com_kunena.install.ini
@@ -27,7 +27,7 @@ COM_KUNENA_SAMPLEDATA_CATEGORY2_DESC = "Have some feedback and input to share? \
COM_KUNENA_SAMPLEDATA_CATEGORY2_HEADER = "This is the optional category header for the Suggestion Box."
COM_KUNENA_SAMPLEDATA_CATEGORY2_TITLE = "Suggestion Box"
COM_KUNENA_SAMPLEDATA_POST_WELCOME_SUBJECT = "Welcome to Kunena!"
-COM_KUNENA_SAMPLEDATA_POST_WELCOME_TEXT_CONTENT = "[size=150][b]Welcome to Kunena![/b][/size] \n\n Thank you for choosing Kunena for your community forum needs in Joomla. \n\n Kunena, translated from Swahili meaning \"to speak\", is built by a team of open source professionals with the goal of providing a top quality, tightly unified forum solution for Joomla. \n\n\n [size=150][b]Additional Kunena Resources[/b][/size] \n\n [b]Kunena Documentation:[/b] [url=https://www.kunena.org/docs/en]www.kunena.org/docs/en[/url] \n\n [b]Kunena Support Forum[/b]: [url=https://www.kunena.org/forum]www.kunena.org/forum[/url] \n\n [b]Kunena Downloads:[/b] [url=https://www.kunena.org/download]www.kunena.org/download[/url] \n\n [b]Kunena Blog:[/b] [url=https://www.kunena.org/blog]www.kunena.org/blog[/url] \n\n [b]Follow Kunena on Twitter:[/b] [url=https://www.kunena.org/twitter]www.kunena.org/twitter[/url]"
+COM_KUNENA_SAMPLEDATA_POST_WELCOME_TEXT_CONTENT = "[size=150][b]Welcome to Kunena![/b][/size] \n\n Thank you for choosing Kunena for your community forum needs in Joomla. \n\n Kunena, translated from Swahili meaning \"to speak\", is built by a team of open source professionals with the goal of providing a top quality, tightly unified forum solution for Joomla. \n\n\n [size=150][b]Additional Kunena Resources[/b][/size] \n\n [b]Kunena Documentation:[/b] [url=https://www.kunena.org/docs/en]www.kunena.org/docs/en[/url] \n\n [b]Kunena Support Forum[/b]: [url=https://www.kunena.org/forum]www.kunena.org/forum[/url] \n\n [b]Kunena Downloads:[/b] [url=https://www.kunena.org/download]www.kunena.org/download[/url] \n\n [b]Kunena Blog:[/b] [url=https://www.kunena.org/blog]www.kunena.org/blog[/url] \n\n [b]Follow Kunena on X:[/b] [url=https://www.kunena.org/twitter]www.kunena.org/twitter[/url]"
COM_KUNENA_SAMPLEDATA_SECTION_DESC = "This is the main forum section. It serves as a container for categories for your topics."
COM_KUNENA_SAMPLEDATA_SECTION_HEADER = "The section header is used to display additional information about the categories of topics that it contains."
COM_KUNENA_SAMPLEDATA_SECTION_TITLE = "Main Forum"
diff --git a/src/admin/language/en-GB/en-GB.com_kunena.libraries.ini b/src/admin/language/en-GB/en-GB.com_kunena.libraries.ini
index 5987720fb9e..76fbe33c12e 100644
--- a/src/admin/language/en-GB/en-GB.com_kunena.libraries.ini
+++ b/src/admin/language/en-GB/en-GB.com_kunena.libraries.ini
@@ -52,9 +52,9 @@ COM_KUNENA_LIB_BBCODE_EBAY_LABEL_BUY_IT_NOW = "Buy It Now"
COM_KUNENA_LIB_BBCODE_EBAY_LABEL_COMPLETED = "Completed"
COM_KUNENA_LIB_BBCODE_EBAY_ERROR_WRONG_ITEM_ID = "The ebay item id given is invalid, no result has been sent"
COM_KUNENA_LIB_BBCODE_EBAY_INVALID_APPID_KEY = "You haven't set a correct eBay AppID key in Kunena configuration settings, please clear cache before to retry"
-COM_KUNENA_LIB_BBCODE_TWITTER_COULD_NOT_GET_TOKEN = "Could not retrieve bearer token (consumer)"
-COM_KUNENA_LIB_BBCODE_TWITTER_INVALID_TWEET_ID = "The tweet ID given is invalid"
-COM_KUNENA_LIB_BBCODE_TWITTER_CONSUMMER_KEY_SECRET_INVALID = "Invalid consumer key/secret in configuration"
+COM_KUNENA_LIB_BBCODE_X_SOCIAL_COULD_NOT_GET_TOKEN = "Could not retrieve bearer token (consumer)"
+COM_KUNENA_LIB_BBCODE_X_SOCIAL_INVALID_TWEET_ID = "The tweet ID given is invalid"
+COM_KUNENA_LIB_BBCODE_X_SOCIAL_CONSUMMER_KEY_SECRET_INVALID = "Invalid consumer key/secret in configuration"
COM_KUNENA_LIB_BBCODE_EBAY_ERROR_NO_EBAY_APP_ID = "No eBay APP ID and/or Cert ID defined in Kunena configuration"
COM_KUNENA_GOOGLE_MAP_NO_KEY_UNABLE_TO_DISPLAY_MAP = "The google map can't be displayed, ask your administrator for more details"
COM_KUNENA_LIB_BBCODE_MAP_ERROR_CITY_MISSING = "The map cannot be displayed, you haven't specified a location yet."
@@ -141,8 +141,8 @@ COM_KUNENA_SCEDITOR_COMMAND_INSERT_EBAY = "Insert ebay item"
COM_KUNENA_SCEDITOR_COMMAND_INSERT_EBAY_ITEM_ID = "Ebay item id:"
COM_KUNENA_SCEDITOR_COMMAND_INSERT_INSTAGRAM = "Insert an instagram item"
COM_KUNENA_SCEDITOR_COMMAND_INSERT_INSTAGRAM_ID = "Instragram id:"
-COM_KUNENA_SCEDITOR_COMMAND_INSERT_TWITTER = "Insert a tweet"
-COM_KUNENA_SCEDITOR_COMMAND_INSERT_TWITTER_ID = "Tweet id:"
+COM_KUNENA_SCEDITOR_COMMAND_INSERT_X_SOCIAL = "Insert a tweet"
+COM_KUNENA_SCEDITOR_COMMAND_INSERT_X_SOCIAL_ID = "Tweet id:"
COM_KUNENA_SCEDITOR_COMMAND_INSERT_MAP = "Insert a map"
COM_KUNENA_SCEDITOR_COMMAND_INSERT_MAP_TYPE = "Type :"
COM_KUNENA_SCEDITOR_COMMAND_INSERT_MAP_TYPE_HYBRID = "Hybrid"
@@ -484,8 +484,8 @@ COM_KUNENA_MYPROFILE_WECHAT = "Wechat"
COM_KUNENA_MYPROFILE_WECHAT_DESC = "This is your Wechat account."
COM_KUNENA_MYPROFILE_TELEGRAM = "Telegram"
COM_KUNENA_MYPROFILE_TELEGRAM_DESC = "This is your Telegram username."
-COM_KUNENA_MYPROFILE_TWITTER = "Twitter"
-COM_KUNENA_MYPROFILE_TWITTER_DESC = "This is your Twitter username."
+COM_KUNENA_MYPROFILE_X_SOCIAL = "X"
+COM_KUNENA_MYPROFILE_X_SOCIAL_DESC = "This is your X (previously Twitter) username."
COM_KUNENA_MYPROFILE_VK = "VK"
COM_KUNENA_MYPROFILE_VK_DESC = "This is your VK username."
COM_KUNENA_MYPROFILE_WHATSAPP = "WhatsApp"
diff --git a/src/admin/language/en-GB/en-GB.com_kunena.views.ini b/src/admin/language/en-GB/en-GB.com_kunena.views.ini
index df9f5077b75..c0a5655b60b 100644
--- a/src/admin/language/en-GB/en-GB.com_kunena.views.ini
+++ b/src/admin/language/en-GB/en-GB.com_kunena.views.ini
@@ -526,10 +526,10 @@ COM_KUNENA_CONFIGURATION_EBAY_API_KEY_LABEL = "eBay AppID key"
COM_KUNENA_CONFIGURATION_EBAY_API_KEY_DESC = "You need to enter the AppID given on your ebay developer account, you need to register on https://developer.ebay.com/ in order to get the AppID"
COM_KUNENA_CONFIGURATION_EBAY_CERTID_KEY_LABEL = "eBay Cert ID (Client Secret)"
COM_KUNENA_CONFIGURATION_EBAY_CERTID_KEY_DESC = "You need to enter the eBay Cert ID given on your ebay developer account"
-COM_KUNENA_CONFIGURATION_TWITTER_API_CONSUMER_KEY_LABEL = "The Twitter consumer key"
-COM_KUNENA_CONFIGURATION_TWITTER_API_CONSUMER_KEY_DESC = "The Twitter consumer key to connect to API"
-COM_KUNENA_CONFIGURATION_TWITTER_API_CONSUMER_SECRET_LABEL = "The Twitter consumer secret"
-COM_KUNENA_CONFIGURATION_TWITTER_API_CONSUMER_SECRET_DESC = "The Twitter consumer secret to connect to API"
+COM_KUNENA_CONFIGURATION_X_SOCIAL_API_CONSUMER_KEY_LABEL = "The X consumer key"
+COM_KUNENA_CONFIGURATION_X_SOCIAL_API_CONSUMER_KEY_DESC = "The X consumer key to connect to API"
+COM_KUNENA_CONFIGURATION_X_SOCIAL_API_CONSUMER_SECRET_LABEL = "The X consumer secret"
+COM_KUNENA_CONFIGURATION_X_SOCIAL_API_CONSUMER_SECRET_DESC = "The X consumer secret to connect to API"
COM_KUNENA_ADMIN_CONFIG_MAX_LINKS = "Max Links in message"
COM_KUNENA_ADMIN_CONFIG_MAX_LINKS_DESC = "Enter here the max links in a message to prevent spam"
COM_KUNENA_CONFIGURATION_CAPTCHA_FOR_WHO_TITLE = "Display Captcha for :"
@@ -874,8 +874,8 @@ COM_KUNENA_TEMPLATE_DISPLAY_MAPS = "Show Maps button"
COM_KUNENA_TEMPLATE_DISPLAY_MAPS_DESC = "Show Maps button on editor"
COM_KUNENA_TEMPLATE_DISPLAY_EMOTICONS = "Show Emoticons button"
COM_KUNENA_TEMPLATE_DISPLAY_EMOTICONS_DESC = "Show Emoticons button on editor"
-COM_KUNENA_TEMPLATE_DISPLAY_TWITTER = "Show Twitter button"
-COM_KUNENA_TEMPLATE_DISPLAY_TWITTER_DESC = "Show Twitter button on editor"
+COM_KUNENA_TEMPLATE_DISPLAY_X_SOCIAL = "Show X button"
+COM_KUNENA_TEMPLATE_DISPLAY_X_SOCIAL_DESC = "Show X button on editor"
COM_KUNENA_TEMPLATE_DISPLAY_EBAY = "Show Ebay button"
COM_KUNENA_TEMPLATE_DISPLAY_EBAY_DESC = "Show Ebay button on editor"
COM_KUNENA_TEMPLATE_DISPLAY_LINK = "Show Link button"
diff --git a/src/admin/src/Model/ConfigModel.php b/src/admin/src/Model/ConfigModel.php
index e78b8029191..d686ab918af 100644
--- a/src/admin/src/Model/ConfigModel.php
+++ b/src/admin/src/Model/ConfigModel.php
@@ -1081,13 +1081,13 @@ class ConfigModel extends AdminModel
public $ebayApiKey = '';
/**
- * @var string Define twitter API consumer key
+ * @var string Define X API consumer key
* @since Kunena 4.0.0
*/
public $twitterConsumerKey = '';
/**
- * @var string Define twitter API consumer secret
+ * @var string Define X API consumer secret
* @since Kunena 4.0.0
*/
public $twitterConsumerSecret = '';
diff --git a/src/admin/tmpl/config/default.php b/src/admin/tmpl/config/default.php
index 0d67ec19a60..c603bd3b041 100644
--- a/src/admin/tmpl/config/default.php
+++ b/src/admin/tmpl/config/default.php
@@ -1667,24 +1667,24 @@ function_exists('php_ini_loaded_file') ? php_ini_loaded_file() : ''