diff --git a/config/config.ini.example b/config/config.ini.example
index 31ba57a..02d0afe 100644
--- a/config/config.ini.example
+++ b/config/config.ini.example
@@ -81,6 +81,9 @@ recent.count = "5"
 ; Popular posts
 popular.count = "5"
 
+; Tagcloud
+tagcloud.count = "40"
+
 ; Teaser type: set "trimmed" or "full".
 teaser.type = "full"
 
diff --git a/content/data/configList.json b/content/data/configList.json
index 99b9bbc..95c379d 100644
--- a/content/data/configList.json
+++ b/content/data/configList.json
@@ -1 +1 @@
-["site.url","timezone","date.format","language","blog.title","blog.tagline","blog.description","blog.copyright","permalink.type","static.frontpage","blog.enable","social.twitter","social.facebook","breadcrumb.home","comment.system","fb.appid","fb.num","fb.color","disqus.shortname","google.wmt.id","google.analytics.id","google.gtag.id","google.reCaptcha","google.reCaptcha.public","google.reCaptcha.private","posts.perpage","category.perpage","tag.perpage","archive.perpage","search.perpage","profile.perpage","type.perpage","json.count","category.info","related.count","recent.count","popular.count","teaser.type","read.more","teaser.char","description.char","rss.count","rss.char","views.counter","sitemap.priority.base","sitemap.priority.post","sitemap.priority.static","sitemap.priority.category","sitemap.priority.tag","sitemap.priority.archiveDay","sitemap.priority.archiveMonth","sitemap.priority.archiveYear","sitemap.priority.author","sitemap.priority.type","prerelease","cache.expiration","cache.off","generation.time","cache.timestamp","views.root","views.layout"]
\ No newline at end of file
+["site.url","timezone","date.format","language","blog.title","blog.tagline","blog.description","blog.copyright","permalink.type","static.frontpage","blog.enable","social.twitter","social.facebook","breadcrumb.home","comment.system","fb.appid","fb.num","fb.color","disqus.shortname","google.wmt.id","google.analytics.id","google.gtag.id","google.reCaptcha","google.reCaptcha.public","google.reCaptcha.private","posts.perpage","category.perpage","tag.perpage","archive.perpage","search.perpage","profile.perpage","type.perpage","json.count","category.info","related.count","recent.count","popular.count","tagcloud.count","teaser.type","read.more","teaser.char","description.char","rss.count","rss.char","views.counter","sitemap.priority.base","sitemap.priority.post","sitemap.priority.static","sitemap.priority.category","sitemap.priority.tag","sitemap.priority.archiveDay","sitemap.priority.archiveMonth","sitemap.priority.archiveYear","sitemap.priority.author","sitemap.priority.type","prerelease","cache.expiration","cache.off","generation.time","cache.timestamp","views.root","views.layout"]
\ No newline at end of file
diff --git a/lang/ar_AR.ini b/lang/ar_AR.ini
index e4ba787..1649b7c 100644
--- a/lang/ar_AR.ini
+++ b/lang/ar_AR.ini
@@ -258,3 +258,17 @@ Posts_by="Posts by"
 Pages="Pages"
 Menu="Menu"
 Popular="Popular"
+;Errors
+User_Error="User field is required"
+Pass_Error="Password field is required"
+Token_Error="CSRF Token not correct"
+Captcha_Error="reCaptcha not correct"
+Invalid_Error="ERROR: Invalid username or password"
+;Profile
+Post_by_author="Posts by this author"
+Author_Description="Just another HTMLy user"
+;404-search
+Search_results_not_found="Search results not found!"
+No_search_results="No search results"
+;TagCloud
+Tagcloud_widget_at_most = "TagCloud at most"
diff --git a/lang/de_DE.ini b/lang/de_DE.ini
index 1914e01..1658776 100644
--- a/lang/de_DE.ini
+++ b/lang/de_DE.ini
@@ -256,3 +256,17 @@ Posts_by="Beiträge von"
 Pages="Seiten"
 Menu="Menüs"
 Popular="Zugriffe"
+;Errors
+User_Error="User field is required"
+Pass_Error="Password field is required"
+Token_Error="CSRF Token not correct"
+Captcha_Error="reCaptcha not correct"
+Invalid_Error="ERROR: Invalid username or password"
+;Profile
+Post_by_author="Posts by this author"
+Author_Description="Just another HTMLy user"
+;404-search
+Search_results_not_found="Search results not found!"
+No_search_results="No search results"
+;TagCloud
+Tagcloud_widget_at_most = "TagCloud at most"
diff --git a/lang/en_US.ini b/lang/en_US.ini
index 4a613e8..28c63eb 100644
--- a/lang/en_US.ini
+++ b/lang/en_US.ini
@@ -268,3 +268,5 @@ Author_Description="Just another HTMLy user"
 ;404-search
 Search_results_not_found="Search results not found!"
 No_search_results="No search results"
+;TagCloud
+Tagcloud_widget_at_most = TagCloud at most
diff --git a/lang/es_ES.ini b/lang/es_ES.ini
index 13d20cf..39d2a8b 100644
--- a/lang/es_ES.ini
+++ b/lang/es_ES.ini
@@ -255,3 +255,17 @@ Posts_by="Posts by"
 Pages="Pages"
 Menu="Menu"
 Popular="Popular"
+;Errors
+User_Error="User field is required"
+Pass_Error="Password field is required"
+Token_Error="CSRF Token not correct"
+Captcha_Error="reCaptcha not correct"
+Invalid_Error="ERROR: Invalid username or password"
+;Profile
+Post_by_author="Posts by this author"
+Author_Description="Just another HTMLy user"
+;404-search
+Search_results_not_found="Search results not found!"
+No_search_results="No search results"
+;TagCloud
+Tagcloud_widget_at_most = "TagCloud at most"
diff --git a/lang/fr_FR.ini b/lang/fr_FR.ini
index c2a9212..c2fc9a6 100644
--- a/lang/fr_FR.ini
+++ b/lang/fr_FR.ini
@@ -256,3 +256,17 @@ Posts_by="Posts by"
 Pages="Pages"
 Menu="Menu"
 Popular="Popular"
+;Errors
+User_Error="User field is required"
+Pass_Error="Password field is required"
+Token_Error="CSRF Token not correct"
+Captcha_Error="reCaptcha not correct"
+Invalid_Error="ERROR: Invalid username or password"
+;Profile
+Post_by_author="Posts by this author"
+Author_Description="Just another HTMLy user"
+;404-search
+Search_results_not_found="Search results not found!"
+No_search_results="No search results"
+;TagCloud
+Tagcloud_widget_at_most = "TagCloud at most"
diff --git a/lang/hu_HU.ini b/lang/hu_HU.ini
index 1660fee..f9c0105 100644
--- a/lang/hu_HU.ini
+++ b/lang/hu_HU.ini
@@ -256,3 +256,17 @@ Posts_by="Posts by"
 Pages="Pages"
 Menu="Menu"
 Popular="Popular"
+;Errors
+User_Error="User field is required"
+Pass_Error="Password field is required"
+Token_Error="CSRF Token not correct"
+Captcha_Error="reCaptcha not correct"
+Invalid_Error="ERROR: Invalid username or password"
+;Profile
+Post_by_author="Posts by this author"
+Author_Description="Just another HTMLy user"
+;404-search
+Search_results_not_found="Search results not found!"
+No_search_results="No search results"
+;TagCloud
+Tagcloud_widget_at_most = "TagCloud at most"
diff --git a/lang/id_ID.ini b/lang/id_ID.ini
index 16615fb..53029b9 100644
--- a/lang/id_ID.ini
+++ b/lang/id_ID.ini
@@ -256,3 +256,17 @@ Posts_by="Posts by"
 Pages="Halaman"
 Menu="Menu"
 Popular="Populer"
+;Errors
+User_Error="User field is required"
+Pass_Error="Password field is required"
+Token_Error="CSRF Token not correct"
+Captcha_Error="reCaptcha not correct"
+Invalid_Error="ERROR: Invalid username or password"
+;Profile
+Post_by_author="Posts by this author"
+Author_Description="Just another HTMLy user"
+;404-search
+Search_results_not_found="Search results not found!"
+No_search_results="No search results"
+;TagCloud
+Tagcloud_widget_at_most = "TagCloud at most"
diff --git a/lang/it_IT.ini b/lang/it_IT.ini
index ab696a5..0f4dc92 100644
--- a/lang/it_IT.ini
+++ b/lang/it_IT.ini
@@ -256,3 +256,17 @@ Posts_by="Posts by"
 Pages="Pages"
 Menu="Menu"
 Popular="Popular"
+;Errors
+User_Error="User field is required"
+Pass_Error="Password field is required"
+Token_Error="CSRF Token not correct"
+Captcha_Error="reCaptcha not correct"
+Invalid_Error="ERROR: Invalid username or password"
+;Profile
+Post_by_author="Posts by this author"
+Author_Description="Just another HTMLy user"
+;404-search
+Search_results_not_found="Search results not found!"
+No_search_results="No search results"
+;TagCloud
+Tagcloud_widget_at_most = "TagCloud at most"
diff --git a/lang/ko_KO.ini b/lang/ko_KO.ini
index efc811f..666dd68 100644
--- a/lang/ko_KO.ini
+++ b/lang/ko_KO.ini
@@ -256,3 +256,17 @@ Posts_by="Posts by"
 Pages="Pages"
 Menu="Menu"
 Popular="Popular"
+;Errors
+User_Error="User field is required"
+Pass_Error="Password field is required"
+Token_Error="CSRF Token not correct"
+Captcha_Error="reCaptcha not correct"
+Invalid_Error="ERROR: Invalid username or password"
+;Profile
+Post_by_author="Posts by this author"
+Author_Description="Just another HTMLy user"
+;404-search
+Search_results_not_found="Search results not found!"
+No_search_results="No search results"
+;TagCloud
+Tagcloud_widget_at_most = "TagCloud at most"
diff --git a/lang/ms_MY.ini b/lang/ms_MY.ini
index 4545e85..39f60c5 100644
--- a/lang/ms_MY.ini
+++ b/lang/ms_MY.ini
@@ -256,3 +256,17 @@ Posts_by="Posts by"
 Pages="Pages"
 Menu="Menu"
 Popular="Popular"
+;Errors
+User_Error="User field is required"
+Pass_Error="Password field is required"
+Token_Error="CSRF Token not correct"
+Captcha_Error="reCaptcha not correct"
+Invalid_Error="ERROR: Invalid username or password"
+;Profile
+Post_by_author="Posts by this author"
+Author_Description="Just another HTMLy user"
+;404-search
+Search_results_not_found="Search results not found!"
+No_search_results="No search results"
+;TagCloud
+Tagcloud_widget_at_most = "TagCloud at most"
diff --git a/lang/nl_NL.ini b/lang/nl_NL.ini
index 6d747b4..6214ac0 100644
--- a/lang/nl_NL.ini
+++ b/lang/nl_NL.ini
@@ -256,3 +256,17 @@ Posts_by="Posts by"
 Pages="Pages"
 Menu="Menu"
 Popular="Popular"
+;Errors
+User_Error="User field is required"
+Pass_Error="Password field is required"
+Token_Error="CSRF Token not correct"
+Captcha_Error="reCaptcha not correct"
+Invalid_Error="ERROR: Invalid username or password"
+;Profile
+Post_by_author="Posts by this author"
+Author_Description="Just another HTMLy user"
+;404-search
+Search_results_not_found="Search results not found!"
+No_search_results="No search results"
+;TagCloud
+Tagcloud_widget_at_most = "TagCloud at most"
diff --git a/lang/pl_PL.ini b/lang/pl_PL.ini
index 6dc793b..297a2d6 100644
--- a/lang/pl_PL.ini
+++ b/lang/pl_PL.ini
@@ -257,3 +257,17 @@ Posts_by="Posts by"
 Pages="Pages"
 Menu="Menu"
 Popular="Popular"
+;Errors
+User_Error="User field is required"
+Pass_Error="Password field is required"
+Token_Error="CSRF Token not correct"
+Captcha_Error="reCaptcha not correct"
+Invalid_Error="ERROR: Invalid username or password"
+;Profile
+Post_by_author="Posts by this author"
+Author_Description="Just another HTMLy user"
+;404-search
+Search_results_not_found="Search results not found!"
+No_search_results="No search results"
+;TagCloud
+Tagcloud_widget_at_most = "TagCloud at most"
diff --git a/lang/pt_BR.ini b/lang/pt_BR.ini
index d3899b1..d7080ca 100644
--- a/lang/pt_BR.ini
+++ b/lang/pt_BR.ini
@@ -256,3 +256,17 @@ Posts_by="Posts by"
 Pages="Pages"
 Menu="Menu"
 Popular="Popular"
+;Errors
+User_Error="User field is required"
+Pass_Error="Password field is required"
+Token_Error="CSRF Token not correct"
+Captcha_Error="reCaptcha not correct"
+Invalid_Error="ERROR: Invalid username or password"
+;Profile
+Post_by_author="Posts by this author"
+Author_Description="Just another HTMLy user"
+;404-search
+Search_results_not_found="Search results not found!"
+No_search_results="No search results"
+;TagCloud
+Tagcloud_widget_at_most = "TagCloud at most"
diff --git a/lang/ru_RU.ini b/lang/ru_RU.ini
index 38993b4..190d9cb 100644
--- a/lang/ru_RU.ini
+++ b/lang/ru_RU.ini
@@ -269,3 +269,5 @@ Author_Description="Еще один пользователь HTMLy"
 ;404-search
 Search_results_not_found="По вашему запросу ничего не найдено!"
 No_search_results="Безрезультатно"
+;TagCloud
+Tagcloud_widget_at_most = "TagCloud at most"
diff --git a/lang/sv_SE.ini b/lang/sv_SE.ini
index 4951e06..394d8b8 100644
--- a/lang/sv_SE.ini
+++ b/lang/sv_SE.ini
@@ -274,3 +274,17 @@ Posts_by="Posts by"
 Pages="Pages"
 Menu="Menu"
 Popular="Popular"
+;Errors
+User_Error="User field is required"
+Pass_Error="Password field is required"
+Token_Error="CSRF Token not correct"
+Captcha_Error="reCaptcha not correct"
+Invalid_Error="ERROR: Invalid username or password"
+;Profile
+Post_by_author="Posts by this author"
+Author_Description="Just another HTMLy user"
+;404-search
+Search_results_not_found="Search results not found!"
+No_search_results="No search results"
+;TagCloud
+Tagcloud_widget_at_most = "TagCloud at most"
diff --git a/lang/tr_TR.ini b/lang/tr_TR.ini
index 6f62380..f94262f 100644
--- a/lang/tr_TR.ini
+++ b/lang/tr_TR.ini
@@ -256,3 +256,17 @@ Posts_by="Posts by"
 Pages="Pages"
 Menu="Menu"
 Popular="Popular"
+;Errors
+User_Error="User field is required"
+Pass_Error="Password field is required"
+Token_Error="CSRF Token not correct"
+Captcha_Error="reCaptcha not correct"
+Invalid_Error="ERROR: Invalid username or password"
+;Profile
+Post_by_author="Posts by this author"
+Author_Description="Just another HTMLy user"
+;404-search
+Search_results_not_found="Search results not found!"
+No_search_results="No search results"
+;TagCloud
+Tagcloud_widget_at_most = "TagCloud at most"
diff --git a/lang/zh_TW.ini b/lang/zh_TW.ini
index 95ad545..3406939 100644
--- a/lang/zh_TW.ini
+++ b/lang/zh_TW.ini
@@ -256,3 +256,17 @@ Posts_by="Posts by"
 Pages="Pages"
 Menu="Menu"
 Popular="Popular"
+;Errors
+User_Error="User field is required"
+Pass_Error="Password field is required"
+Token_Error="CSRF Token not correct"
+Captcha_Error="reCaptcha not correct"
+Invalid_Error="ERROR: Invalid username or password"
+;Profile
+Post_by_author="Posts by this author"
+Author_Description="Just another HTMLy user"
+;404-search
+Search_results_not_found="Search results not found!"
+No_search_results="No search results"
+;TagCloud
+Tagcloud_widget_at_most = "TagCloud at most"
diff --git a/system/admin/views/config-widget.html.php b/system/admin/views/config-widget.html.php
index 8365ea2..7774e09 100644
--- a/system/admin/views/config-widget.html.php
+++ b/system/admin/views/config-widget.html.php
@@ -51,6 +51,12 @@
       <input type="number" name="-config-popular.count" class="form-control" id="popular.count" value="<?php echo config('popular.count');?>">
     </div>
   </div>
+  <div class="form-group row">
+    <label for="tagcloud.count" class="col-sm-2 col-form-label"><?php echo i18n('Tagcloud_widget_at_most');?></label>
+    <div class="col-sm-10">
+      <input type="number" name="-config-tagcloud.count" class="form-control" id="tagcloud.count" value="<?php echo config('tagcloud.count');?>">
+    </div>
+  </div>
   <br>
   <h4><?php echo i18n('Comments');?></h4>
   <hr>
diff --git a/system/includes/functions.php b/system/includes/functions.php
index 39c9e9a..f2f8f69 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -1458,6 +1458,11 @@ function tag_cloud($custom = null)
 
     $posts = get_post_unsorted();
     $tags = array();
+	
+    $tagcloud_count = config('tagcloud.count');
+    if(empty($tagcloud_count)) {
+        $tagcloud_count = 40;
+    }
 
     if (!empty($posts)) {
 
@@ -1497,7 +1502,11 @@ function tag_cloud($custom = null)
             // this is the increase per tag quantity (times used)
             $step = ($max_size - $min_size)/($spread);
 
-            foreach ($tag_collection as $tag => $count) {
+
+            arsort($tag_collection);
+            $sliced_tags = array_slice($tag_collection, 0, $tagcloud_count, true);
+            ksort($sliced_tags);
+            foreach ($sliced_tags as $tag => $count) {
                 $size = $min_size + (($count - $min_qty) * $step);
                 echo ' <a class="tag-cloud-link" href="'. site_url(). 'tag/'. $tag .'" style="font-size:'. $size .'pt;">'.tag_i18n($tag).'</a> ';
             }