From 30ba85fef03be14898af4547e70bb4d0a8e955b3 Mon Sep 17 00:00:00 2001
From: acanas <acanas@ugr.es>
Date: Sun, 26 Dec 2021 16:22:58 +0100
Subject: [PATCH] Version 21.74:    Dec 26, 2021  Working on design of dark
 theme. Code refactoring related to links.

---
 css/{swad21.73.css => swad21.74.css} | 108 +++++++++++----------------
 swad_HTML.c                          |   8 +-
 swad_HTML.h                          |   4 +-
 swad_ID.c                            |   2 +-
 swad_MFU.c                           |   7 +-
 swad_agenda.c                        |   2 +-
 swad_announcement.c                  |  33 ++++----
 swad_assignment.c                    |   2 +-
 swad_attendance.c                    |   4 +-
 swad_browser.c                       |  64 ++++++----------
 swad_building.c                      |   4 +-
 swad_button.c                        |  12 +--
 swad_center.c                        |  32 +++-----
 swad_center_config.c                 |  16 ++--
 swad_changelog.h                     |   7 +-
 swad_chat.c                          |   2 +-
 swad_connected.c                     |  35 +++------
 swad_country.c                       |  20 +++--
 swad_country_config.c                |  16 ++--
 swad_course.c                        |  52 +++++--------
 swad_course_config.c                 |  14 +---
 swad_date.c                          |   4 +-
 swad_degree.c                        |  22 +++---
 swad_degree_config.c                 |  10 +--
 swad_degree_type.c                   |   4 +-
 swad_department.c                    |  13 ++--
 swad_enrolment.c                     |   8 +-
 swad_exam.c                          |  19 ++---
 swad_exam_session.c                  |  14 ++--
 swad_figure.c                        |   2 +-
 swad_follow.c                        |  27 ++++---
 swad_forum.c                         |   5 +-
 swad_game.c                          |  19 ++---
 swad_hierarchy.c                     |  30 ++++----
 swad_hierarchy_config.c              |  11 ++-
 swad_holiday.c                       |   5 +-
 swad_info.c                          |   2 +-
 swad_institution.c                   |  33 +++-----
 swad_institution_config.c            |   6 +-
 swad_layout.c                        |   4 +-
 swad_link.c                          |   2 +-
 swad_mail.c                          |   5 +-
 swad_match.c                         |  42 +++++------
 swad_menu.c                          |   8 +-
 swad_message.c                       |  17 +++--
 swad_notice.c                        |  47 +++++++-----
 swad_notification.c                  |   8 +-
 swad_pagination.c                    |  12 +--
 swad_photo.c                         |  12 +--
 swad_photo_shape.c                   |   2 +
 swad_place.c                         |   5 +-
 swad_profile.c                       |  12 +--
 swad_project.c                       |  10 +--
 swad_question.c                      |   5 +-
 swad_record.c                        |  23 +++---
 swad_room.c                          |   5 +-
 swad_statistic.c                     |  27 +++----
 swad_survey.c                        |  14 ++--
 swad_system_config.c                 |   8 +-
 swad_tab.c                           |   6 +-
 swad_theme.c                         |  11 +++
 swad_timeline_comment.c              |  13 ++--
 swad_timeline_form.c                 |   2 +-
 swad_timeline_note.c                 |  10 +--
 swad_timeline_post.c                 |   2 +-
 swad_user.c                          |  12 +--
 66 files changed, 446 insertions(+), 556 deletions(-)
 rename css/{swad21.73.css => swad21.74.css} (98%)

diff --git a/css/swad21.73.css b/css/swad21.74.css
similarity index 98%
rename from css/swad21.73.css
rename to css/swad21.74.css
index 70f9ea29..ddba0dcd 100644
--- a/css/swad21.73.css
+++ b/css/swad21.74.css
@@ -781,7 +781,7 @@ a:hover						/* Default ==> underlined */
 .TAB_ON_BLUE	{background-color:#e8f3f6;}
 .TAB_ON_YELLOW	{background-color:#faf0da;}
 .TAB_ON_PINK	{background-color:#faf0e8;}
-.TAB_ON_DARK	{background-color:#606060;}
+.TAB_ON_DARK	{background-color:#585858;}
 
 .TAB_OFF_WHITE	{background-color:#d4d4d4;}
 .TAB_OFF_GREY	{background-color:#aea79f;}
@@ -1626,10 +1626,12 @@ a:hover img.CENTER_PHOTO_SHOW
 	border:none;
 	padding:0;
 	font:inherit;
+	color:inherit;
 	}
 .BT_LINK:hover
 	{
 	cursor:pointer;
+	text-decoration:underline;
 	}
 
 /****************************** Course program *******************************/
@@ -1700,87 +1702,68 @@ a:hover img.CENTER_PHOTO_SHOW
 	{
 	to {background-color:white;}
 	}
-.NOTICE_CONT_ACTIVE
+.NOTICE_CONT
 	{
 	box-sizing:border-box;
 	margin:0 auto 10px auto;
 	padding:10px;
-	background-image:-webkit-linear-gradient(rgba(238,216,108,0.6) 0%,rgba(248,237,149,0.6) 15%,rgba(250,240,152,0.6) 100%);	/* Safari */
-	background-image:linear-gradient(rgba(238,216,108,0.6) 0%,rgba(248,237,149,0.6) 15%,rgba(250,240,152,0.6) 100%);	
-	box-shadow:0 8px 10px -5px rgba(125,113,0,0.6);
-	text-align:left;
-	overflow:hidden;
-	}
-.NOTICE_CONT_OBSOLETE
-	{
-	box-sizing:border-box;
-	margin:0 auto 10px auto;
-	padding:10px;
-	background-image:-webkit-linear-gradient(rgba(238,216,108,0.3) 0%,rgba(248,237,149,0.3) 15%,rgba(250,240,152,0.3) 100%);	/* Safari */
-	background-image:linear-gradient(rgba(238,216,108,0.3) 0%,rgba(248,237,149,0.3) 15%,rgba(250,240,152,0.3) 100%);	
-	box-shadow:0 8px 10px -5px rgba(125,113,0,0.3);
+	background-image:-webkit-linear-gradient(rgba(238,216,108,0.5) 0%,rgba(248,237,149,0.5) 15%,rgba(250,240,152,0.5) 100%);	/* Safari */
+	background-image:linear-gradient(rgba(238,216,108,0.5) 0%,rgba(248,237,149,0.5) 15%,rgba(250,240,152,0.5) 100%);	
+	box-shadow:0 8px 10px -5px rgba(125,113,0,0.5);
 	text-align:left;
 	overflow:hidden;
 	}
 .NOTICE_CONT_NARROW	{width:148px;}
 .NOTICE_CONT_WIDE	{width:500px;}
-.NOTICE_DATE_ACTIVE
+.NOTICE_DATE
 	{
 	float:right;
 	font-size:12pt;
-	color:#202020;
 	text-align:right;
 	overflow:hidden;
 	}
-.NOTICE_DATE_OBSOLETE
-	{
-	float:right;
-	font-size:12pt;
-	color:#808080;
-	text-align:right;
-	overflow:hidden;
-	}
-.NOTICE_SUBJECT_ACTIVE
+.NOTICE_DATE_WHITE	{color:#202020;}
+.NOTICE_DATE_GREY	{color:#202020;}
+.NOTICE_DATE_PURPLE	{color:#202020;}
+.NOTICE_DATE_BLUE	{color:#202020;}
+.NOTICE_DATE_YELLOW	{color:#202020;}
+.NOTICE_DATE_PINK	{color:#202020;}
+.NOTICE_DATE_DARK	{color:white;}
+.NOTICE_SUBJECT
 	{
 	margin:12px auto;
 	font-size:15pt;
 	font-weight:bold;
-	color:#202020;
-	text-align:center;
-	overflow:hidden;
-	}
-.NOTICE_SUBJECT_OBSOLETE
-	{
-	margin:12px auto;
-	font-size:15pt;
-	font-weight:bold;
-	color:#808080;
 	text-align:center;
 	overflow:hidden;
 	}
+.NOTICE_SUBJECT_WHITE	{color:#202020;}
+.NOTICE_SUBJECT_GREY	{color:#202020;}
+.NOTICE_SUBJECT_PURPLE	{color:#202020;}
+.NOTICE_SUBJECT_BLUE	{color:#202020;}
+.NOTICE_SUBJECT_YELLOW	{color:#202020;}
+.NOTICE_SUBJECT_PINK	{color:#202020;}
+.NOTICE_SUBJECT_DARK	{color:white;}
 .NOTICE_TEXT_BRIEF
 	{
 	clear:both;
 	font-size:12pt;
-	color:#204080;
 	overflow:hidden;
 	}
-.NOTICE_TEXT_ACTIVE
+.NOTICE_TEXT
 	{
 	padding:10px 20px;
 	clear:both;
 	font-size:12pt;
-	color:#204080;
-	overflow:hidden;
-	}
-.NOTICE_TEXT_OBSOLETE
-	{
-	padding:10px 20px;
-	clear:both;
-	font-size:12pt;
-	color:#4070A0;
 	overflow:hidden;
 	}
+.NOTICE_TEXT_WHITE	{color:#204080;}
+.NOTICE_TEXT_GREY	{color:#204080;}
+.NOTICE_TEXT_PURPLE	{color:#204080;}
+.NOTICE_TEXT_BLUE	{color:#204080;}
+.NOTICE_TEXT_YELLOW	{color:#204080;}
+.NOTICE_TEXT_PINK	{color:#204080;}
+.NOTICE_TEXT_DARK	{color:#f0f8ff;}
 .NOTICE_AUTHOR
 	{
 	box-sizing:border-box;
@@ -1793,29 +1776,22 @@ a:hover img.CENTER_PHOTO_SHOW
 	text-overflow:ellipsis;
 	font-size:12pt;
 	}
-.NOTICE_AUTHOR_ACTIVE
-	{
-	color:#202020;
-	}
-.NOTICE_AUTHOR_OBSOLETE
-	{
-	color:#808080;
-	}
+.NOTICE_AUTHOR_WHITE	{color:#202020;}
+.NOTICE_AUTHOR_GREY	{color:#202020;}
+.NOTICE_AUTHOR_PURPLE	{color:#202020;}
+.NOTICE_AUTHOR_BLUE	{color:#202020;}
+.NOTICE_AUTHOR_YELLOW	{color:#202020;}
+.NOTICE_AUTHOR_PINK	{color:#202020;}
+.NOTICE_AUTHOR_DARK	{color:white;}
 .NOTICE_USERS
 	{
 	box-sizing:border-box;
 	text-align:center;
 	vertical-align:middle;
 	margin:12px;
-	}
-.NOTICE_USERS_ACTIVE
-	{
+	font-size:12pt;
 	color:#202020;
 	}
-.NOTICE_USERS_OBSOLETE
-	{
-	color:#808080;
-	}
 
 /**************************** Institutional links ****************************/
 #institutional_links
@@ -2380,7 +2356,7 @@ table.CELLS_PAD_10	> tbody > tr > td {padding:10px;}
 .FORM_OUT_BLUE		{color:#4d88a1; font-size:13pt;}
 .FORM_OUT_YELLOW	{color:#7c4d2a; font-size:13pt;}
 .FORM_OUT_PINK		{color:#63474e; font-size:13pt;}
-.FORM_OUT_DARK		{color:#a6c4d0; font-size:13pt;}
+.FORM_OUT_DARK		{color:#d3e2e8; font-size:13pt;}
 
 /****************************** Placing of objects ***************************/
 .LT	{text-align:left;   vertical-align:top;   }	/* Left Top      */
@@ -4418,6 +4394,10 @@ a.PAG:hover, .PAG_CUR
 
 /************ Something that takes up space but which is invisible ***********/
 .LIGHT
+	{
+	opacity:0.5;
+	}
+.VERY_LIGHT
 	{
 	opacity:0.2;
 	}
diff --git a/swad_HTML.c b/swad_HTML.c
index d49a6c21..c5535b32 100644
--- a/swad_HTML.c
+++ b/swad_HTML.c
@@ -1419,7 +1419,7 @@ void HTM_BUTTON_OnMouseDown_Begin (const char *Title,const char *Class)
    HTM_BUTTON_NestingLevel++;
   }
 
-void HTM_BUTTON_SUBMIT_Begin (const char *Title,const char *Class,const char *OnSubmit)
+void HTM_BUTTON_OnSubmit_Begin (const char *Title,const char *Class,const char *OnSubmit)
   {
    HTM_Txt ("<button type=\"submit\"");
    if (Title)
@@ -1436,7 +1436,7 @@ void HTM_BUTTON_SUBMIT_Begin (const char *Title,const char *Class,const char *On
    HTM_BUTTON_NestingLevel++;
   }
 
-void HTM_BUTTON_BUTTON_Begin (const char *Title,const char *Class,const char *OnClick)
+void HTM_BUTTON_OnClick_Begin (const char *Title,const char *Class,const char *OnClick)
   {
    HTM_Txt ("<button type=\"button\"");
    if (Title)
@@ -1852,8 +1852,8 @@ void HTM_Unsigned (unsigned Num)
 
 void HTM_Light0 (void)
   {
-   HTM_SPAN_Begin ("class=\"LIGHT\"");
-   HTM_Txt ("0");
+   HTM_SPAN_Begin ("class=\"VERY_LIGHT\"");
+      HTM_Txt ("0");
    HTM_SPAN_End ();
   }
 
diff --git a/swad_HTML.h b/swad_HTML.h
index 1566a9df..57c2ea50 100644
--- a/swad_HTML.h
+++ b/swad_HTML.h
@@ -149,8 +149,8 @@ void HTM_INPUT_CHECKBOX (const char *Name,HTM_SubmitOnChange_t SubmitOnChange,
 		         const char *fmt,...);
 
 void HTM_BUTTON_OnMouseDown_Begin (const char *Title,const char *Class);
-void HTM_BUTTON_SUBMIT_Begin (const char *Title,const char *Class,const char *OnSubmit);
-void HTM_BUTTON_BUTTON_Begin (const char *Title,const char *Class,const char *OnClick);
+void HTM_BUTTON_OnSubmit_Begin (const char *Title,const char *Class,const char *OnSubmit);
+void HTM_BUTTON_OnClick_Begin (const char *Title,const char *Class,const char *OnClick);
 void HTM_BUTTON_Animated_Begin (const char *Title,const char *Class,const char *OnClick);
 void HTM_BUTTON_End (void);
 
diff --git a/swad_ID.c b/swad_ID.c
index 918bdc31..ed347efb 100644
--- a/swad_ID.c
+++ b/swad_ID.c
@@ -424,7 +424,7 @@ static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID,
       Par_PutHiddenParamString (NULL,"UsrID",UsrDat->IDs.List[NumID].ID);
 
       /***** Put link *****/
-      HTM_BUTTON_SUBMIT_Begin (Txt_Confirm_ID,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],NULL);
+      HTM_BUTTON_OnSubmit_Begin (Txt_Confirm_ID,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],NULL);
 	 Ico_PutIconTextLink ("check.svg",Ico_BLACK,Txt_Confirm_ID);
       HTM_BUTTON_End ();
 
diff --git a/swad_MFU.c b/swad_MFU.c
index 450cd2d6..2638d58e 100644
--- a/swad_MFU.c
+++ b/swad_MFU.c
@@ -219,7 +219,7 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions)
 		  /* Icon and text */
 		  HTM_LI_Begin ("class=\"ICO_HIGHLIGHT\"");
 		     Frm_BeginForm (Action);
-			HTM_BUTTON_SUBMIT_Begin (TabMenuStr,The_ClassFormLinkInBoxNoWrap[Gbl.Prefs.Theme],NULL);
+			HTM_BUTTON_OnSubmit_Begin (TabMenuStr,The_ClassFormLinkInBoxNoWrap[Gbl.Prefs.Theme],NULL);
 			   HTM_IMG (Gbl.Prefs.URLIconSet,Act_GetIcon (Action),MenuStr,
 				    "class=\"%s\"",
 				    Ico_ClassColor[Ico_BLACK][Gbl.Prefs.Theme]);
@@ -260,7 +260,8 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions)
    HTM_DIV_Begin ("id=\"MFU_actions\"");
 
       Frm_BeginForm (ActMFUAct);
-	 HTM_BUTTON_SUBMIT_Begin (Txt_My_frequent_actions,"BT_LINK MFU_TITLE",NULL);
+	 HTM_BUTTON_OnSubmit_Begin (Txt_My_frequent_actions,
+	                            "BT_LINK MFU_TITLE",NULL);
 	    HTM_TxtF ("%s",Txt_Frequent_ACTIONS);
 	 HTM_BUTTON_End ();
       Frm_EndForm ();
@@ -285,7 +286,7 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions)
 	       /* Icon and text */
 	       HTM_LI_Begin ("class=\"ICO_HIGHLIGHT\"");
 		  Frm_BeginForm (Action);
-		     HTM_BUTTON_SUBMIT_Begin (TabMenuStr,"BT_LINK",NULL);
+		     HTM_BUTTON_OnSubmit_Begin (TabMenuStr,"BT_LINK",NULL);
 			HTM_IMG (Gbl.Prefs.URLIconSet,Act_GetIcon (Action),MenuStr,
 				 NULL);
 			HTM_TxtF ("&nbsp;%s",MenuStr);
diff --git a/swad_agenda.c b/swad_agenda.c
index d28c5989..b20913b7 100644
--- a/swad_agenda.c
+++ b/swad_agenda.c
@@ -652,7 +652,7 @@ static void Agd_WriteHeaderListEvents (const struct Agd_Agenda *Agenda,
 				   Agenda->CurrentPage,
 				   -1L);
 
-	       HTM_BUTTON_SUBMIT_Begin (Txt_START_END_TIME_HELP[Order],"BT_LINK TIT_TBL",NULL);
+	       HTM_BUTTON_OnSubmit_Begin (Txt_START_END_TIME_HELP[Order],"BT_LINK TIT_TBL",NULL);
 		  if (Order == Agenda->SelectedOrder)
 		     HTM_U_Begin ();
 
diff --git a/swad_announcement.c b/swad_announcement.c
index 0ff007dd..b5d135ab 100644
--- a/swad_announcement.c
+++ b/swad_announcement.c
@@ -225,28 +225,24 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status,
                                     bool ShowAllAnnouncements,
                                     bool ICanEdit)
   {
+   extern const char *The_ClassNoticeTextColor[The_NUM_THEMES];
    extern const char *Txt_Users;
    extern const char *Txt_ROLES_PLURAL_abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
    extern const char *Txt_Do_not_show_again;
    static const char *ContainerClass[Ann_NUM_STATUS] =
      {
-      [Ann_ACTIVE_ANNOUNCEMENT  ] = "NOTICE_CONT_ACTIVE NOTICE_CONT_WIDE",
-      [Ann_OBSOLETE_ANNOUNCEMENT] = "NOTICE_CONT_OBSOLETE NOTICE_CONT_WIDE",
+      [Ann_ACTIVE_ANNOUNCEMENT  ] = "NOTICE_CONT NOTICE_CONT_WIDE",
+      [Ann_OBSOLETE_ANNOUNCEMENT] = "NOTICE_CONT NOTICE_CONT_WIDE LIGHT",
      };
-   static const char *SubjectClass[Ann_NUM_STATUS] =
+   static const char *The_ClassNoticeSubjectColor[The_NUM_THEMES] =
      {
-      [Ann_ACTIVE_ANNOUNCEMENT  ] = "NOTICE_SUBJECT_ACTIVE",
-      [Ann_OBSOLETE_ANNOUNCEMENT] = "NOTICE_SUBJECT_OBSOLETE",
-     };
-   static const char *ContentClass[Ann_NUM_STATUS] =
-     {
-      [Ann_ACTIVE_ANNOUNCEMENT  ] = "NOTICE_TEXT_ACTIVE",
-      [Ann_OBSOLETE_ANNOUNCEMENT] = "NOTICE_TEXT_OBSOLETE",
-     };
-   static const char *UsersClass[Ann_NUM_STATUS] =
-     {
-      [Ann_ACTIVE_ANNOUNCEMENT  ] = "NOTICE_USERS_ACTIVE",
-      [Ann_OBSOLETE_ANNOUNCEMENT] = "NOTICE_USERS_OBSOLETE",
+      [The_THEME_WHITE ] = "NOTICE_SUBJECT_WHITE",
+      [The_THEME_GREY  ] = "NOTICE_SUBJECT_GREY",
+      [The_THEME_PURPLE] = "NOTICE_SUBJECT_PURPLE",
+      [The_THEME_BLUE  ] = "NOTICE_SUBJECT_BLUE",
+      [The_THEME_YELLOW] = "NOTICE_SUBJECT_YELLOW",
+      [The_THEME_PINK  ] = "NOTICE_SUBJECT_PINK",
+      [The_THEME_DARK  ] = "NOTICE_SUBJECT_DARK",
      };
    Rol_Role_t Role;
    bool SomeRolesAreSelected;
@@ -275,18 +271,19 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status,
 	}
 
       /***** Write the subject of the announcement *****/
-      HTM_DIV_Begin ("class=\"%s\"",SubjectClass[Status]);
+      HTM_DIV_Begin ("class=\"NOTICE_SUBJECT %s\"",The_ClassNoticeSubjectColor[Gbl.Prefs.Theme]);
 	 HTM_Txt (Subject);
       HTM_DIV_End ();
 
       /***** Write the content of the announcement *****/
-      HTM_DIV_Begin ("class=\"%s\"",ContentClass[Status]);
+      HTM_DIV_Begin ("class=\"NOTICE_TEXT %s\"",
+                     The_ClassNoticeTextColor[Gbl.Prefs.Theme]);
 	 HTM_Txt (Content);
       HTM_DIV_End ();
 
       /***** Write announcement foot *****/
       /* Begin container for foot */
-      HTM_DIV_Begin ("class=\"NOTICE_USERS %s\"",UsersClass[Status]);
+      HTM_DIV_Begin ("class=\"NOTICE_USERS\"");
 
 	 if (ShowAllAnnouncements)
 	   {
diff --git a/swad_assignment.c b/swad_assignment.c
index 2c3a8b8b..383e2fc4 100644
--- a/swad_assignment.c
+++ b/swad_assignment.c
@@ -241,7 +241,7 @@ static void Asg_PutHeadForSeeing (struct Asg_Assignments *Assignments,
 		  Dat_PutHiddenParamOrder (Order);
 
 	          /* Begin link to select order */
-		  HTM_BUTTON_SUBMIT_Begin (Txt_START_END_TIME_HELP[Order],"BT_LINK TIT_TBL",NULL);
+		  HTM_BUTTON_OnSubmit_Begin (Txt_START_END_TIME_HELP[Order],"BT_LINK TIT_TBL",NULL);
 		  if (Order == Assignments->SelectedOrder)
 		     HTM_U_Begin ();
 	      }
diff --git a/swad_attendance.c b/swad_attendance.c
index 668b61e2..8b06cd98 100644
--- a/swad_attendance.c
+++ b/swad_attendance.c
@@ -270,7 +270,7 @@ static void Att_ShowAllAttEvents (struct Att_Events *Events)
 			Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Events->CurrentPage);
 			Dat_PutHiddenParamOrder (Order);
 
-			HTM_BUTTON_SUBMIT_Begin (Txt_START_END_TIME_HELP[Order],"BT_LINK TIT_TBL",NULL);
+			HTM_BUTTON_OnSubmit_Begin (Txt_START_END_TIME_HELP[Order],"BT_LINK TIT_TBL",NULL);
 
 			   if (Order == Events->SelectedOrder)
 			      HTM_U_Begin ();
@@ -1849,7 +1849,7 @@ static void Att_PutLinkAttEvent (struct Att_Event *AttEvent,
       Att_PutParamsCodGrps (AttEvent->AttCod);
 
       /***** Link to view attendance event *****/
-      HTM_BUTTON_SUBMIT_Begin (Title,Class,NULL);
+      HTM_BUTTON_OnSubmit_Begin (Title,Class,NULL);
 	 HTM_Txt (Txt);
       HTM_BUTTON_End ();
 
diff --git a/swad_browser.c b/swad_browser.c
index df46c531..1f1e3292 100644
--- a/swad_browser.c
+++ b/swad_browser.c
@@ -3260,7 +3260,7 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat)
 	    /***** Show user's name *****/
 	    HTM_BR ();
 
-	    HTM_BUTTON_SUBMIT_Begin (Txt_View_record_for_this_course,"BT_LINK AUTHOR_TXT",NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Txt_View_record_for_this_course,"BT_LINK",NULL);
 	       HTM_Txt (UsrDat->Surname1);
 	       if (UsrDat->Surname2[0])
 		  HTM_TxtF ("&nbsp;%s",UsrDat->Surname2);
@@ -5214,7 +5214,6 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic)
    extern const char *Txt_Public_open_educational_resource_OER_for_everyone;
    bool ICanEditFileOrFolder;
    char FileNameToShow[NAME_MAX + 1];
-   char *Class;
 
    /***** Get the name of the file to show *****/
    Brw_GetFileNameToShowDependingOnLevel (Gbl.FileBrowser.Type,
@@ -5289,15 +5288,12 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic)
 	    Brw_PutImplicitParamsFileBrowser (&Gbl.FileBrowser.FilFolLnk);
 
 	    /* Link to the form and to the file */
-	    if (asprintf (&Class,"BT_LINK FILENAME %s",Gbl.FileBrowser.TxtStyle) < 0)
-	       Err_NotEnoughMemoryExit ();
-	    HTM_BUTTON_SUBMIT_Begin ((Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS ||
-				      Gbl.FileBrowser.Type == Brw_SHOW_MRK_GRP) ? Txt_Check_marks_in_the_file :
-										  Txt_Download,
-				     Class,NULL);
+	    HTM_BUTTON_OnSubmit_Begin ((Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS ||
+				       Gbl.FileBrowser.Type == Brw_SHOW_MRK_GRP) ? Txt_Check_marks_in_the_file :
+										   Txt_Download,
+				       "BT_LINK FILENAME",NULL);
 	       HTM_Txt (FileNameToShow);
 	    HTM_BUTTON_End ();
-	    free (Class);
 
 	 Frm_EndForm ();
 
@@ -8511,7 +8507,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
 	 Brw_PutImplicitParamsFileBrowser (&Gbl.FileBrowser.FilFolLnk);
 
 	 /* Begin link */
-	 HTM_BUTTON_SUBMIT_Begin (Txt_Check_marks_in_the_file,"BT_LINK FILENAME_TXT",NULL);
+	 HTM_BUTTON_OnSubmit_Begin (Txt_Check_marks_in_the_file,"BT_LINK FILENAME_TXT",NULL);
 
 	    Brw_PutIconFile (FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name,
 			     "ICO40x40",false);
@@ -8567,11 +8563,7 @@ static void Brw_WriteSmallLinkToDownloadFile (const char *URL,
 	 Brw_PutImplicitParamsFileBrowser (&Gbl.FileBrowser.FilFolLnk);
 
 	 /* Begin link */
-	 HTM_BUTTON_SUBMIT_Begin (Txt_Check_marks_in_the_file,
-	                          Str_BuildString ("BT_LINK %s",
-	                                           The_ClassDat[Gbl.Prefs.Theme]),
-	                          NULL);
-         Str_FreeStrings ();
+	 HTM_BUTTON_OnSubmit_Begin (Txt_Check_marks_in_the_file,"BT_LINK",NULL);
 
 	    /* Name of the file of marks */
 	    HTM_Txt (FileNameToShow);
@@ -9959,15 +9951,13 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
 	 HTM_TD_End ();
 
 	 /***** Write institution logo, institution short name *****/
-	 HTM_TD_Begin ("class=\"LT %s\"",BgColor);
+	 HTM_TD_Begin ("class=\"%s LT %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor);
 	    if (InsCod > 0)
 	      {
 	       Frm_BeginFormGoTo (ActSeeInsInf);
 		  Deg_PutParamDegCod (InsCod);
-		  HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (InsShortName),
-		                           Str_BuildString ("BT_LINK LT %s",
-		                                            The_ClassDat[Gbl.Prefs.Theme]),
-		                           NULL);
+		  HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (InsShortName),
+		                             "BT_LINK LT",NULL);
 		  Str_FreeStrings ();
 		     Lgo_DrawLogo (HieLvl_INS,InsCod,InsShortName,20,"BT_LINK LT",true);
 		     HTM_TxtF ("&nbsp;%s",InsShortName);
@@ -9977,15 +9967,13 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
 	 HTM_TD_End ();
 
 	 /***** Write center logo, center short name *****/
-	 HTM_TD_Begin ("class=\"LT %s\"",BgColor);
+	 HTM_TD_Begin ("class=\"%s LT %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor);
 	    if (CtrCod > 0)
 	      {
 	       Frm_BeginFormGoTo (ActSeeCtrInf);
 		  Deg_PutParamDegCod (CtrCod);
-		  HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (CtrShortName),
-		                           Str_BuildString ("BT_LINK LT %s",
-		                                            The_ClassDat[Gbl.Prefs.Theme]),
-					   NULL);
+		  HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (CtrShortName),
+		                             "BT_LINK LT",NULL);
 		  Str_FreeStrings ();
 		     Lgo_DrawLogo (HieLvl_CTR,CtrCod,CtrShortName,20,"LT",true);
 		     HTM_TxtF ("&nbsp;%s",CtrShortName);
@@ -9995,15 +9983,13 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
 	 HTM_TD_End ();
 
 	 /***** Write degree logo, degree short name *****/
-	 HTM_TD_Begin ("class=\"LT %s\"",BgColor);
+	 HTM_TD_Begin ("class=\"%s LT %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor);
 	    if (DegCod > 0)
 	      {
 	       Frm_BeginFormGoTo (ActSeeDegInf);
 		  Deg_PutParamDegCod (DegCod);
-		  HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (DegShortName),
-		                           Str_BuildString ("BT_LINK LT %s",
-		                                            The_ClassDat[Gbl.Prefs.Theme]),
-					   NULL);
+		  HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (DegShortName),
+		                             "BT_LINK LT",NULL);
 		  Str_FreeStrings ();
 		     Lgo_DrawLogo (HieLvl_DEG,DegCod,DegShortName,20,"LT",true);
 		     HTM_TxtF ("&nbsp;%s",DegShortName);
@@ -10013,15 +9999,13 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
 	 HTM_TD_End ();
 
 	 /***** Write course short name *****/
-	 HTM_TD_Begin ("class=\"LT %s\"",BgColor);
+	 HTM_TD_Begin ("class=\"%s LT %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor);
 	    if (CrsCod > 0)
 	      {
 	       Frm_BeginFormGoTo (ActSeeCrsInf);
 		  Crs_PutParamCrsCod (CrsCod);
-		  HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (CrsShortName),
-		                           Str_BuildString ("BT_LINK %s",
-		                                            The_ClassDat[Gbl.Prefs.Theme]),
-		                           NULL);
+		  HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (CrsShortName),
+		                             "BT_LINK",NULL);
 		  Str_FreeStrings ();
 		     HTM_Txt (CrsShortName);
 		  HTM_BUTTON_End ();
@@ -10120,17 +10104,13 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
 	    if (FileMetadata.FilFolLnk.Type == Brw_IS_FOLDER)
 	       Brw_PutImplicitParamsFileBrowser (&Gbl.FileBrowser.FilFolLnk);
 	    else
-	       Brw_PutParamsFileBrowser (NULL,		// Not used
-					 NULL,		// Not used
+	       Brw_PutParamsFileBrowser (NULL,			// Not used
+					 NULL,			// Not used
 					 Brw_IS_UNKNOWN,	// Not used
 					 FileMetadata.FilCod);
 
 	    /* File or folder icon */
-	    HTM_BUTTON_SUBMIT_Begin (FileNameToShow,
-	                             Str_BuildString ("BT_LINK LT %s",
-	                                              The_ClassDatStrong[Gbl.Prefs.Theme]),
-	                             NULL);
-	    Str_FreeStrings ();
+	    HTM_BUTTON_OnSubmit_Begin (FileNameToShow,"BT_LINK LT",NULL);
 	       if (FileMetadata.FilFolLnk.Type == Brw_IS_FOLDER)
 		  /* Icon with folder */
 		  Ico_PutIcon ("folder-yellow.png",Ico_UNCHANGED,
diff --git a/swad_building.c b/swad_building.c
index 216046f6..5de48ed7 100644
--- a/swad_building.c
+++ b/swad_building.c
@@ -126,10 +126,10 @@ void Bld_SeeBuildings (void)
 		 Order <= (Bld_Order_t) (Bld_NUM_ORDERS - 1);
 		 Order++)
 	      {
-	       HTM_TH_Begin (1,1,"LM");
+	       HTM_TH_Begin (1,1,"TIT_TBL LM");
 		  Frm_BeginForm (ActSeeBld);
 		     Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-		     HTM_BUTTON_SUBMIT_Begin (Txt_BUILDINGS_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
+		     HTM_BUTTON_OnSubmit_Begin (Txt_BUILDINGS_HELP_ORDER[Order],"BT_LINK",NULL);
 			if (Order == Buildings.SelectedOrder)
 			   HTM_U_Begin ();
 			HTM_Txt (Txt_BUILDINGS_ORDER[Order]);
diff --git a/swad_button.c b/swad_button.c
index 07316a14..7f1715fc 100644
--- a/swad_button.c
+++ b/swad_button.c
@@ -68,7 +68,7 @@ void Btn_PutButtonInline (Btn_Button_t Button,const char *TxtButton)
 void Btn_PutCreateButton (const char *TxtButton)
   {
    HTM_DIV_Begin ("class=\"CM\"");
-      HTM_BUTTON_SUBMIT_Begin (NULL,"BT_SUBMIT BT_CREATE",NULL);
+      HTM_BUTTON_OnSubmit_Begin (NULL,"BT_SUBMIT BT_CREATE",NULL);
 	 HTM_Txt (TxtButton);
       HTM_BUTTON_End ();
    HTM_DIV_End ();
@@ -76,7 +76,7 @@ void Btn_PutCreateButton (const char *TxtButton)
 
 void Btn_PutCreateButtonInline (const char *TxtButton)
   {
-   HTM_BUTTON_SUBMIT_Begin (NULL,"BT_SUBMIT_INLINE BT_CREATE",NULL);
+   HTM_BUTTON_OnSubmit_Begin (NULL,"BT_SUBMIT_INLINE BT_CREATE",NULL);
       HTM_Txt (TxtButton);
    HTM_BUTTON_End ();
   }
@@ -84,7 +84,7 @@ void Btn_PutCreateButtonInline (const char *TxtButton)
 void Btn_PutConfirmButton (const char *TxtButton)
   {
    HTM_DIV_Begin ("class=\"CM\"");
-      HTM_BUTTON_SUBMIT_Begin (NULL,"BT_SUBMIT BT_CONFIRM",NULL);
+      HTM_BUTTON_OnSubmit_Begin (NULL,"BT_SUBMIT BT_CONFIRM",NULL);
 	 HTM_Txt (TxtButton);
       HTM_BUTTON_End ();
    HTM_DIV_End ();
@@ -92,7 +92,7 @@ void Btn_PutConfirmButton (const char *TxtButton)
 
 void Btn_PutConfirmButtonInline (const char *TxtButton)
   {
-   HTM_BUTTON_SUBMIT_Begin (NULL,"BT_SUBMIT_INLINE BT_CONFIRM",NULL);
+   HTM_BUTTON_OnSubmit_Begin (NULL,"BT_SUBMIT_INLINE BT_CONFIRM",NULL);
       HTM_Txt (TxtButton);
    HTM_BUTTON_End ();
   }
@@ -100,7 +100,7 @@ void Btn_PutConfirmButtonInline (const char *TxtButton)
 void Btn_PutRemoveButton (const char *TxtButton)
   {
    HTM_DIV_Begin ("class=\"CM\"");
-      HTM_BUTTON_SUBMIT_Begin (NULL,"BT_SUBMIT BT_REMOVE",NULL);
+      HTM_BUTTON_OnSubmit_Begin (NULL,"BT_SUBMIT BT_REMOVE",NULL);
 	 HTM_Txt (TxtButton);
       HTM_BUTTON_End ();
    HTM_DIV_End ();
@@ -108,7 +108,7 @@ void Btn_PutRemoveButton (const char *TxtButton)
 
 void Btn_PutRemoveButtonInline (const char *TxtButton)
   {
-   HTM_BUTTON_SUBMIT_Begin (NULL,"BT_SUBMIT_INLINE BT_REMOVE",NULL);
+   HTM_BUTTON_OnSubmit_Begin (NULL,"BT_SUBMIT_INLINE BT_REMOVE",NULL);
       HTM_Txt (TxtButton);
    HTM_BUTTON_End ();
   }
diff --git a/swad_center.c b/swad_center.c
index f5460549..1d64f74e 100644
--- a/swad_center.c
+++ b/swad_center.c
@@ -153,12 +153,9 @@ void Ctr_SeeCtrWithPendingDegs (void)
 	    /* Center logo and full name */
 	    HTM_TR_Begin (NULL);
 
-	       HTM_TD_Begin ("class=\"LM %s\"",BgColor);
+	       HTM_TD_Begin ("class=\"%s LM %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor);
 		  Ctr_DrawCenterLogoAndNameWithLink (&Ctr,ActSeeDeg,
-						     Str_BuildString ("BT_LINK %s NOWRAP",
-						                      The_ClassDat[Gbl.Prefs.Theme]),
-						     "CM");
-		  Str_FreeStrings ();
+						     "BT_LINK NOWRAP","CM");
 	       HTM_TD_End ();
 
 	       /* Number of pending degrees (row[1]) */
@@ -192,7 +189,7 @@ void Ctr_DrawCenterLogoAndNameWithLink (struct Ctr_Center *Ctr,Act_Action_t Acti
       Ctr_PutParamCtrCod (Ctr->CtrCod);
 
       /***** Link to action *****/
-      HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Ctr->FullName),ClassLink,NULL);
+      HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Ctr->FullName),ClassLink,NULL);
       Str_FreeStrings ();
 
 	 /***** Center logo and name *****/
@@ -347,15 +344,13 @@ static void Ctr_ListOneCenterForSeeing (struct Ctr_Center *Ctr,unsigned NumCtr)
 
    if (Ctr->Status & Hie_STATUS_BIT_PENDING)
      {
-      TxtClassNormal = The_ClassDatLight[Gbl.Prefs.Theme];
-      TxtClassStrong = Str_BuildString ("BT_LINK LT %s",
-                                        The_ClassDatLight[Gbl.Prefs.Theme]);
+      TxtClassNormal =
+      TxtClassStrong = The_ClassDatLight[Gbl.Prefs.Theme];
      }
    else
      {
       TxtClassNormal = The_ClassDat[Gbl.Prefs.Theme];
-      TxtClassStrong = Str_BuildString ("BT_LINK LT %s",
-                                        The_ClassDatStrong[Gbl.Prefs.Theme]);
+      TxtClassStrong = The_ClassDatStrong[Gbl.Prefs.Theme];
      }
    BgColor = (Ctr->CtrCod == Gbl.Hierarchy.Ctr.CtrCod) ? The_ClassBgHighlight[Gbl.Prefs.Theme] :
                                                          Gbl.ColorRows[Gbl.RowEvenOdd];
@@ -368,9 +363,9 @@ static void Ctr_ListOneCenterForSeeing (struct Ctr_Center *Ctr,unsigned NumCtr)
       HTM_TD_End ();
 
       /***** Center logo and name *****/
-      HTM_TD_Begin ("class=\"LM %s\"",BgColor);
+      HTM_TD_Begin ("class=\"%s LM %s\"",TxtClassStrong,BgColor);
 	 Ctr_DrawCenterLogoAndNameWithLink (Ctr,ActSeeDeg,
-					    TxtClassStrong,"CM");
+					    "BT_LINK LT","CM");
       HTM_TD_End ();
 
       /***** Number of users who claim to belong to this center *****/
@@ -406,7 +401,6 @@ static void Ctr_ListOneCenterForSeeing (struct Ctr_Center *Ctr,unsigned NumCtr)
 
    HTM_TR_End ();
 
-   Str_FreeStrings ();
    Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
   }
 
@@ -1438,16 +1432,14 @@ static void Ctr_PutHeadCentersForSeeing (bool OrderSelectable)
 	   Order <= (Ctr_Order_t) (Ctr_NUM_ORDERS - 1);
 	   Order++)
 	{
-	 HTM_TH_Begin (1,1,Order == Ctr_ORDER_BY_CENTER ? "LM" :
-							  "RM");
+	 HTM_TH_Begin (1,1,Order == Ctr_ORDER_BY_CENTER ? "TIT_TBL LM" :
+							  "TIT_TBL RM");
 	    if (OrderSelectable)
 	      {
 	       Frm_BeginForm (ActSeeCtr);
 		  Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-		  HTM_BUTTON_SUBMIT_Begin (Txt_CENTERS_HELP_ORDER[Order],
-					   Order == Ctr_ORDER_BY_CENTER ? "BT_LINK LM TIT_TBL" :
-									  "BT_LINK RM TIT_TBL",
-					   NULL);
+		  HTM_BUTTON_OnSubmit_Begin (Txt_CENTERS_HELP_ORDER[Order],
+					     "BT_LINK",NULL);
 		     if (Order == Gbl.Hierarchy.Ctrs.SelectedOrder)
 			HTM_U_Begin ();
 	      }
diff --git a/swad_center_config.c b/swad_center_config.c
index 04cedd4a..6bfe0b9b 100644
--- a/swad_center_config.c
+++ b/swad_center_config.c
@@ -597,10 +597,8 @@ static void CtrCfg_Institution (bool PrintView,bool PutForm)
 	      {
 	       Frm_BeginFormGoTo (ActSeeInsInf);
 		  Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod);
-		  HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Ins.ShrtName),
-		                           Str_BuildString ("BT_LINK LT %s",
-		                                            The_ClassDat[Gbl.Prefs.Theme]),
-					   NULL);
+		  HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Ins.ShrtName),
+		                             "BT_LINK LT",NULL);
 		  Str_FreeStrings ();
 	      }
 
@@ -772,14 +770,12 @@ static void CtrCfg_NumDegs (void)
       Frm_LabelColumn ("RT",NULL,Txt_Degrees);
 
       /* Data */
-      HTM_TD_Begin ("class=\"LB\"");
+      HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
 	 Frm_BeginFormGoTo (ActSeeDeg);
 	    Ctr_PutParamCtrCod (Gbl.Hierarchy.Ctr.CtrCod);
-	    HTM_BUTTON_SUBMIT_Begin (Str_BuildString (Txt_Degrees_of_CENTER_X,
-						      Gbl.Hierarchy.Ctr.ShrtName),
-				     Str_BuildString ("BT_LINK %s",
-				                      The_ClassDat[Gbl.Prefs.Theme]),
-				     NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Str_BuildString (Txt_Degrees_of_CENTER_X,
+						        Gbl.Hierarchy.Ctr.ShrtName),
+				       "BT_LINK",NULL);
 	    Str_FreeStrings ();
 	       HTM_Unsigned (Deg_GetCachedNumDegsInCtr (Gbl.Hierarchy.Ctr.CtrCod));
 	    HTM_BUTTON_End ();
diff --git a/swad_changelog.h b/swad_changelog.h
index 276cc686..f578b019 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -602,10 +602,13 @@ TODO: FIX BUG, URGENT! En las fechas como par
 
 TODO: En las encuestas, que los estudiantes no puedan ver los resultados hasta que no finalice el plazo.
 */
-#define Log_PLATFORM_VERSION	"SWAD 21.73 (2021-12-23)"
-#define CSS_FILE		"swad21.73.css"
+#define Log_PLATFORM_VERSION	"SWAD 21.74 (2021-12-26)"
+#define CSS_FILE		"swad21.74.css"
 #define JS_FILE			"swad21.67.4.js"
 /*
+	Version 21.74:    Dec 26, 2021  Working on design of dark theme.
+				        Code refactoring related to links. (322483 lines)
+	Version 21.73.1:  Dec 23, 2021  Changes in notice/announcement colors. (322516 lines)
 	Version 21.73:    Dec 23, 2021  Working on design of dark theme. (322591 lines)
 Copy the following icons to icon public directory:
 sudo cp icon/first-day-of-week-0.png /var/www/html/swad/icon/
diff --git a/swad_chat.c b/swad_chat.c
index 4d804563..f6b3e0d8 100644
--- a/swad_chat.c
+++ b/swad_chat.c
@@ -316,7 +316,7 @@ static void Cht_WriteLinkToChat1 (const char *RoomCode,const char *RoomShrtName,
 	 Cht_WriteParamsRoomCodeAndNames (RoomCode,RoomShrtName,RoomFullName);
 
 	 /* Begin button */
-	 HTM_BUTTON_SUBMIT_Begin (RoomFullName,The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL);
+	 HTM_BUTTON_OnSubmit_Begin (RoomFullName,The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL);
   }
 
 static void Cht_WriteLinkToChat2 (const char *RoomCode,const char *RoomFullName)
diff --git a/swad_connected.c b/swad_connected.c
index b41dfc6d..ef8c2c52 100644
--- a/swad_connected.c
+++ b/swad_connected.c
@@ -180,7 +180,7 @@ void Con_ShowGlobalConnectedUsrs (void)
       Frm_BeginFormUnique (ActLstCon);	// Must be unique because
 					// the list of connected users
 					// is dynamically updated via AJAX
-	 HTM_BUTTON_SUBMIT_Begin (Txt_Connected_users,"BT_LINK CONNECTED_TXT",NULL);
+	 HTM_BUTTON_OnSubmit_Begin (Txt_Connected_users,"BT_LINK CONNECTED_TXT",NULL);
 
 	    /* Write total number of sessions */
 	    HTM_TxtF ("%u&nbsp;%s",Gbl.Session.NumSessions,
@@ -330,7 +330,7 @@ void Con_ShowConnectedUsrsBelongingToCurrentCrs (void)
       Frm_BeginFormUnique (ActLstCon);	// Must be unique because
 					   // the list of connected users
 					   // is dynamically updated via AJAX
-	 HTM_BUTTON_SUBMIT_Begin (Txt_Connected_users,"BT_LINK CONNECTED_TXT",NULL);
+	 HTM_BUTTON_OnSubmit_Begin (Txt_Connected_users,"BT_LINK CONNECTED_TXT",NULL);
 	    Str_Copy (CourseName,Gbl.Hierarchy.Crs.ShrtName,sizeof (CourseName) - 1);
 	    Con_GetNumConnectedWithARoleBelongingToCurrentScope (Rol_UNK,&Usrs);
 	    HTM_TxtF ("%u %s %s",Usrs.NumUsrs,Txt_from,CourseName);
@@ -564,7 +564,6 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role)
       [Pho_SHAPE_RECTANGLE] = "PHOTOR21x28",
      };
    const char *ClassTxt;
-   const char *ClassLink;
    long UsrCod;
    bool ItsMe;
    struct UsrData *UsrDat;
@@ -600,16 +599,8 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role)
       HTM_TD_End ();
 
       /***** Write full name and link *****/
-      if (Gbl.Usrs.Connected.Lst[Gbl.Usrs.Connected.NumUsr].ThisCrs)
-	{
-	 ClassTxt = "CON_NAME_NARROW CON_CRS";
-	 ClassLink = "BT_LINK CON_NAME_NARROW CON_CRS";
-	}
-      else
-	{
-	 ClassTxt = "CON_NAME_NARROW CON_NO_CRS";
-	 ClassLink = "BT_LINK CON_NAME_NARROW CON_NO_CRS";
-	}
+      ClassTxt = (Gbl.Usrs.Connected.Lst[Gbl.Usrs.Connected.NumUsr].ThisCrs) ? "CON_NAME_NARROW CON_CRS" :
+									       "CON_NAME_NARROW CON_NO_CRS";
       HTM_TD_Begin ("class=\"%s %s\"",ClassTxt,Gbl.ColorRows[Gbl.RowEvenOdd]);
 	 // The form must be unique because
 	 // the list of connected users
@@ -620,7 +611,8 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role)
 	    Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
 
 	    HTM_DIV_Begin ("class=\"CON_NAME_NARROW\"");	// Limited width
-	       HTM_BUTTON_SUBMIT_Begin (Txt_View_record_for_this_course,ClassLink,NULL);
+	       HTM_BUTTON_OnSubmit_Begin (Txt_View_record_for_this_course,
+	                                  "BT_LINK",NULL);
 		  Usr_WriteFirstNameBRSurnames (UsrDat);
 	       HTM_BUTTON_End ();
 	    HTM_DIV_End ();
@@ -672,7 +664,6 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
    bool ThisCrs;
    time_t TimeDiff;
    const char *ClassTxt;
-   const char *ClassLink;
    struct UsrData UsrDat;
    bool PutLinkToRecord = (Gbl.Hierarchy.Level == HieLvl_CRS &&	// Course selected
 	                   Gbl.Scope.Current   == HieLvl_CRS &&	// Scope is current course
@@ -717,16 +708,8 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
 	       HTM_TD_End ();
 
 	       /***** Write full name and link *****/
-	       if (ThisCrs)
-		 {
-		  ClassTxt = "CON_NAME_WIDE CON_CRS";
-		  ClassLink = "BT_LINK CON_NAME_WIDE CON_CRS";
-		 }
-	       else
-		 {
-		  ClassTxt = "CON_NAME_WIDE CON_NO_CRS";
-		  ClassLink = "BT_LINK CON_NAME_WIDE CON_NO_CRS";
-		 }
+	       ClassTxt = ThisCrs ? "CON_NAME_WIDE CON_CRS" :
+			            "CON_NAME_WIDE CON_NO_CRS";
 	       HTM_TD_Begin ("class=\"%s %s\"",
 	                     ClassTxt,Gbl.ColorRows[Gbl.RowEvenOdd]);
 
@@ -740,7 +723,7 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
 
 		  HTM_DIV_Begin ("class=\"CON_NAME_WIDE\"");	// Limited width
 		     if (PutLinkToRecord)
-			HTM_BUTTON_SUBMIT_Begin (UsrDat.FullName,ClassLink,NULL);
+			HTM_BUTTON_OnSubmit_Begin (UsrDat.FullName,"BT_LINK",NULL);
 		     Usr_WriteFirstNameBRSurnames (&UsrDat);
 		     if (PutLinkToRecord)
 			HTM_BUTTON_End ();
diff --git a/swad_country.c b/swad_country.c
index cadda0a4..7016cbfd 100644
--- a/swad_country.c
+++ b/swad_country.c
@@ -154,13 +154,12 @@ void Cty_SeeCtyWithPendingInss (void)
 	    HTM_TR_Begin (NULL);
 
 	       /* Country map */
-	       HTM_TD_Begin ("class=\"LM %s\"",BgColor);
+	       HTM_TD_Begin ("class=\"%s LM %s\"",
+	                     The_ClassDat[Gbl.Prefs.Theme],BgColor);
 		  Cty_DrawCountryMapAndNameWithLink (&Cty,ActSeeIns,
 						     "COUNTRY_SMALL",
 						     "COUNTRY_MAP_SMALL",
-						     Str_BuildString ("BT_LINK %s",
-						                      The_ClassDat[Gbl.Prefs.Theme]));
-		  Str_FreeStrings ();
+						     "BT_LINK");
 	       HTM_TD_End ();
 
 	       /* Number of pending institutions (row[1]) */
@@ -368,7 +367,7 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
 	   {
 	    Frm_BeginForm (ActSeeCty);
 	       Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-	       HTM_BUTTON_SUBMIT_Begin (Txt_COUNTRIES_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
+	       HTM_BUTTON_OnSubmit_Begin (Txt_COUNTRIES_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
 		  if (Order == Gbl.Hierarchy.Ctys.SelectedOrder)
 		     HTM_U_Begin ();
 	   }
@@ -418,13 +417,12 @@ static void Cty_ListOneCountryForSeeing (struct Cty_Countr *Cty,unsigned NumCty)
       HTM_TD_End ();
 
       /***** Country map (and link to WWW if exists) *****/
-      HTM_TD_Begin ("class=\"LM %s\"",BgColor);
+      HTM_TD_Begin ("class=\"%s LM %s\"",
+                    The_ClassDatStrong[Gbl.Prefs.Theme],BgColor);
 	 Cty_DrawCountryMapAndNameWithLink (Cty,ActSeeIns,
 					    "COUNTRY_SMALL",
 					    "COUNTRY_MAP_SMALL",
-					    Str_BuildString ("BT_LINK %s",
-					                     The_ClassDatStrong[Gbl.Prefs.Theme]));
-	 Str_FreeStrings ();
+					    "BT_LINK");
       HTM_TD_End ();
 
       /***** Number of users who claim to belong to this country *****/
@@ -517,7 +515,7 @@ void Cty_DrawCountryMapAndNameWithLink (struct Cty_Countr *Cty,Act_Action_t Acti
       HTM_DIV_Begin ("class=\"%s\"",ClassContainer);
 
 	 /***** Link to action *****/
-	 HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Cty->Name[Gbl.Prefs.Language]),
+	 HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Cty->Name[Gbl.Prefs.Language]),
 				  ClassLink,NULL);
 	 Str_FreeStrings ();
 
@@ -924,7 +922,7 @@ void Cty_WriteCountryName (long CtyCod,const char *ClassLink)
       /***** Write country name with link to country information *****/
       Frm_BeginForm (ActSeeCtyInf);
 	 Cty_PutParamCtyCod (CtyCod);
-	 HTM_BUTTON_SUBMIT_Begin (Act_GetActionText (ActSeeCtyInf),ClassLink,NULL);
+	 HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeCtyInf),ClassLink,NULL);
 	    HTM_Txt (CtyName);
 	 HTM_BUTTON_End ();
       Frm_EndForm ();
diff --git a/swad_country_config.c b/swad_country_config.c
index 09ea6124..f3414da4 100644
--- a/swad_country_config.c
+++ b/swad_country_config.c
@@ -375,10 +375,8 @@ static void CtyCfg_Platform (bool PrintView)
 	 if (!PrintView)
 	   {
 	    Frm_BeginFormGoTo (ActSeeSysInf);
-	       HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Cfg_PLATFORM_SHORT_NAME),
-					Str_BuildString ("BT_LINK LT %s",
-					                 The_ClassDat[Gbl.Prefs.Theme]),
-					NULL);
+	       HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Cfg_PLATFORM_SHORT_NAME),
+					  "BT_LINK LT",NULL);
 	       Str_FreeStrings ();
 	   }
 	 Ico_PutIcon ("swad64x64.png",Ico_UNCHANGED,Cfg_PLATFORM_FULL_NAME,"ICO20x20");
@@ -481,14 +479,12 @@ static void CtyCfg_NumInss (void)
       Frm_LabelColumn ("RT",NULL,Txt_Institutions);
 
       /* Data */
-      HTM_TD_Begin ("class=\"LB\"");
+      HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
 	 Frm_BeginFormGoTo (ActSeeIns);
 	    Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod);
-	    HTM_BUTTON_SUBMIT_Begin (Str_BuildString (Txt_Institutions_of_COUNTRY_X,
-						      Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]),
-				     Str_BuildString ("BT_LINK %s",
-				                      The_ClassDat[Gbl.Prefs.Theme]),
-				     NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Str_BuildString (Txt_Institutions_of_COUNTRY_X,
+						        Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]),
+				       "BT_LINK",NULL);
 	    Str_FreeStrings ();
 	       HTM_Unsigned (Ins_GetCachedNumInssInCty (Gbl.Hierarchy.Cty.CtyCod));
 	    HTM_BUTTON_End ();
diff --git a/swad_course.c b/swad_course.c
index 9ddeae4d..926a3158 100644
--- a/swad_course.c
+++ b/swad_course.c
@@ -193,7 +193,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
 						  ClassNormal);
 	    Frm_BeginForm (ActMyCrs);
 	       Cty_PutParamCtyCod (-1L);
-	       HTM_BUTTON_SUBMIT_Begin (Txt_System,
+	       HTM_BUTTON_OnSubmit_Begin (Txt_System,
 					Highlight ? ClassHighlight :
 						    ClassNormal,
 					NULL);
@@ -226,7 +226,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
 	       Lay_IndentDependingOnLevel (1,IsLastItemInLevel);
 	       Frm_BeginForm (ActMyCrs);
 		  Cty_PutParamCtyCod (Hie.Cty.CtyCod);
-		  HTM_BUTTON_SUBMIT_Begin (Act_GetActionText (ActSeeCtyInf),
+		  HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeCtyInf),
 					   Highlight ? ClassHighlight :
 						       ClassNormal,
 					   NULL);
@@ -261,7 +261,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
 		  Lay_IndentDependingOnLevel (2,IsLastItemInLevel);
 		  Frm_BeginForm (ActMyCrs);
 		     Ins_PutParamInsCod (Hie.Ins.InsCod);
-		     HTM_BUTTON_SUBMIT_Begin (Act_GetActionText (ActSeeInsInf),
+		     HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeInsInf),
 					      Highlight ? ClassHighlight :
 							  ClassNormal,
 					      NULL);
@@ -296,7 +296,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
 		     Lay_IndentDependingOnLevel (3,IsLastItemInLevel);
 		     Frm_BeginForm (ActMyCrs);
 			Ctr_PutParamCtrCod (Hie.Ctr.CtrCod);
-			HTM_BUTTON_SUBMIT_Begin (Act_GetActionText (ActSeeCtrInf),
+			HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeCtrInf),
 						 Highlight ? ClassHighlight :
 							     ClassNormal,
 						 NULL);
@@ -331,7 +331,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
 			Lay_IndentDependingOnLevel (4,IsLastItemInLevel);
 			Frm_BeginForm (ActMyCrs);
 			   Deg_PutParamDegCod (Hie.Deg.DegCod);
-			   HTM_BUTTON_SUBMIT_Begin (Act_GetActionText (ActSeeDegInf),
+			   HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeDegInf),
 						    Highlight ? ClassHighlight :
 								ClassNormal,
 						    NULL);
@@ -366,7 +366,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
 			   Lay_IndentDependingOnLevel (5,IsLastItemInLevel);
 			   Frm_BeginForm (ActMyCrs);
 			      Crs_PutParamCrsCod (Hie.Crs.CrsCod);
-			      HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Hie.Crs.ShrtName),
+			      HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Hie.Crs.ShrtName),
 						       Highlight ? ClassHighlight :
 								   ClassNormal,
 						       NULL);
@@ -962,15 +962,13 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
 	 ThisYearHasCourses = true;
 	 if (Crs->Status & Hie_STATUS_BIT_PENDING)
 	   {
-	    TxtClassNormal = The_ClassDatLight[Gbl.Prefs.Theme];
-	    TxtClassStrong = Str_BuildString ("BT_LINK LT %s",
-	                                      The_ClassDatLight[Gbl.Prefs.Theme]);
+	    TxtClassNormal =
+	    TxtClassStrong = The_ClassDatLight[Gbl.Prefs.Theme];
 	   }
 	 else
 	   {
 	    TxtClassNormal = The_ClassDat[Gbl.Prefs.Theme];
-	    TxtClassStrong = Str_BuildString ("BT_LINK LT %s",
-	                                      The_ClassDatStrong[Gbl.Prefs.Theme]);
+	    TxtClassStrong = The_ClassDatStrong[Gbl.Prefs.Theme];
 	   }
 
 	 /* Check if this course is one of my courses */
@@ -1010,8 +1008,8 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
 	    HTM_TD_Begin ("class=\"%s LM %s\"",TxtClassStrong,BgColor);
 	       Frm_BeginFormGoTo (ActSeeCrsInf);
 		  Crs_PutParamCrsCod (Crs->CrsCod);
-		  HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Crs->FullName),
-					   TxtClassStrong,NULL);
+		  HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Crs->FullName),
+					     "BT_LINK",NULL);
 		  Str_FreeStrings ();
 		     HTM_Txt (Crs->FullName);
 		  HTM_BUTTON_End ();
@@ -1033,8 +1031,6 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
             Hie_WriteStatusCell (Crs->Status,TxtClassNormal,BgColor,Txt_COURSE_STATUS);
 
 	 HTM_TR_End ();
-
-	 Str_FreeStrings ();
 	}
      }
 
@@ -2422,7 +2418,6 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
    unsigned NumTchs;
    unsigned NumUsrs;
    const char *ClassTxt;
-   const char *ClassLink;
    const char *BgColor;
    bool Accepted;
    static unsigned RowEvenOdd = 1;
@@ -2452,18 +2447,8 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
    NumNETs = Enr_GetNumUsrsInCrss (HieLvl_CRS,CrsCod,1 << Rol_NET);
    NumTchs = Enr_GetNumUsrsInCrss (HieLvl_CRS,CrsCod,1 << Rol_TCH);
    NumUsrs = NumStds + NumNETs + NumTchs;
-   if (NumUsrs)
-     {
-      ClassTxt  = The_ClassDatStrong[Gbl.Prefs.Theme];
-      ClassLink = Str_BuildString ("BT_LINK LT %s",
-                                   The_ClassDatStrong[Gbl.Prefs.Theme]);
-     }
-   else
-     {
-      ClassTxt  = The_ClassDat[Gbl.Prefs.Theme];
-      ClassLink = Str_BuildString ("BT_LINK LT %s",
-                                   The_ClassDat[Gbl.Prefs.Theme]);
-     }
+   ClassTxt = NumUsrs ? The_ClassDatStrong[Gbl.Prefs.Theme] :
+	                The_ClassDat[Gbl.Prefs.Theme];
    BgColor = (CrsCod == Gbl.Hierarchy.Crs.CrsCod) ? The_ClassBgHighlight[Gbl.Prefs.Theme] :
                                                     Gbl.ColorRows[RowEvenOdd];
 
@@ -2490,10 +2475,11 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
 
       /***** Write degree logo, degree short name (row[2])
 	     and center short name (row[6]) *****/
-      HTM_TD_Begin ("class=\"LT %s\"",BgColor);
+      HTM_TD_Begin ("class=\"%s LT %s\"",ClassTxt,BgColor);
 	 Frm_BeginFormGoTo (ActSeeDegInf);
 	    Deg_PutParamDegCod (Deg.DegCod);
-	    HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (row[2]),ClassLink,NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (row[2]),"BT_LINK",NULL);
+            Str_FreeStrings ();
 	       Lgo_DrawLogo (HieLvl_DEG,Deg.DegCod,Deg.ShrtName,20,"CT",true);
 	       HTM_TxtF ("&nbsp;%s&nbsp;(%s)",row[2],row[6]);
 	    HTM_BUTTON_End ();
@@ -2506,10 +2492,11 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
       HTM_TD_End ();
 
       /***** Write course full name (row[5]) *****/
-      HTM_TD_Begin ("class=\"LT %s\"",BgColor);
+      HTM_TD_Begin ("class=\"%s LT %s\"",ClassTxt,BgColor);
 	 Frm_BeginFormGoTo (ActSeeCrsInf);
 	    Crs_PutParamCrsCod (CrsCod);
-	    HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (row[5]),ClassLink,NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (row[5]),"BT_LINK",NULL);
+            Str_FreeStrings ();
 	       HTM_Txt (row[5]);
 	    HTM_BUTTON_End ();
 	 Frm_EndForm ();
@@ -2532,7 +2519,6 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
 
    HTM_TR_End ();
 
-   Str_FreeStrings ();
    RowEvenOdd = 1 - RowEvenOdd;
   }
 
diff --git a/swad_course_config.c b/swad_course_config.c
index 6e47808b..eb2bf8a6 100644
--- a/swad_course_config.c
+++ b/swad_course_config.c
@@ -251,10 +251,8 @@ static void CrsCfg_Degree (bool PrintView,bool PutForm)
 	      {
 	       Frm_BeginFormGoTo (ActSeeDegInf);
 		  Deg_PutParamDegCod (Gbl.Hierarchy.Deg.DegCod);
-		  HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Deg.ShrtName),
-					   Str_BuildString ("BT_LINK LT %s",
-					                    The_ClassDat[Gbl.Prefs.Theme]),
-					   NULL);
+		  HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Deg.ShrtName),
+					     "BT_LINK LT",NULL);
 		  Str_FreeStrings ();
 	      }
 	    Lgo_DrawLogo (HieLvl_DEG,Gbl.Hierarchy.Deg.DegCod,Gbl.Hierarchy.Deg.ShrtName,
@@ -444,17 +442,13 @@ static void CrsCfg_Indicators (void)
       Frm_LabelColumn ("RT",NULL,Txt_Indicators);
 
       /* Data */
-      HTM_TD_Begin ("class=\"LB\"");
+      HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
 	 Frm_BeginForm (ActReqStaCrs);
 	    if (asprintf (&Title,"%u %s %u",
 			  IndicatorsCrs.NumIndicators,
 			  Txt_of_PART_OF_A_TOTAL,Ind_NUM_INDICATORS) < 0)
 	       Err_NotEnoughMemoryExit ();
-	    HTM_BUTTON_SUBMIT_Begin (Title,
-	                             Str_BuildString ("BT_LINK %s",
-	                                              The_ClassDat[Gbl.Prefs.Theme]),
-	                             NULL);
-	    Str_FreeStrings ();
+	    HTM_BUTTON_OnSubmit_Begin (Title,"BT_LINK",NULL);
 	       HTM_TxtF ("%s&nbsp;",Title);
 	       if (IndicatorsCrs.NumIndicators == Ind_NUM_INDICATORS)
 		  Ico_PutIcon ("check-circle.svg",Ico_GREEN,
diff --git a/swad_date.c b/swad_date.c
index 97257b73..9840d8a5 100644
--- a/swad_date.c
+++ b/swad_date.c
@@ -338,7 +338,7 @@ void Dat_ShowClientLocalTime (void)
       /* Month with link to calendar */
       HTM_DIV_Begin ("id=\"current_month\"");
 	 Frm_BeginForm (ActSeeCal);
-	    HTM_BUTTON_SUBMIT_Begin (Txt_Show_calendar,"BT_LINK CURRENT_MONTH",NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Txt_Show_calendar,"BT_LINK CURRENT_MONTH",NULL);
 	       HTM_SPAN_Begin ("id=\"current_month_txt\"");
 	       // JavaScript will write HTML here
 	       HTM_SPAN_End ();
@@ -351,7 +351,7 @@ void Dat_ShowClientLocalTime (void)
 	 if (Gbl.Usrs.Me.Logged)
 	   {
 	    Frm_BeginForm (ActSeeMyAgd);
-	       HTM_BUTTON_SUBMIT_Begin (Txt_Show_agenda,"BT_LINK CURRENT_DAY",NULL);
+	       HTM_BUTTON_OnSubmit_Begin (Txt_Show_agenda,"BT_LINK CURRENT_DAY",NULL);
 	   }
 	 HTM_SPAN_Begin ("id=\"current_day_txt\"");
 	 // JavaScript will write HTML here
diff --git a/swad_degree.c b/swad_degree.c
index 36c494b3..a8fbe734 100644
--- a/swad_degree.c
+++ b/swad_degree.c
@@ -158,12 +158,10 @@ void Deg_SeeDegWithPendingCrss (void)
 	    HTM_TR_Begin (NULL);
 
 	       /* Degree logo and full name */
-	       HTM_TD_Begin ("class=\"LM %s\"",BgColor);
+	       HTM_TD_Begin ("class=\"%s LM %s\"",
+	                     The_ClassDat[Gbl.Prefs.Theme],BgColor);
 		  Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeCrs,
-						     Str_BuildString ("BT_LINK %s NOWRAP",
-						                      The_ClassDat[Gbl.Prefs.Theme]),
-						     "CM");
-		  Str_FreeStrings ();
+						     "BT_LINK NOWRAP","CM");
 	       HTM_TD_End ();
 
 	       /* Number of pending courses (row[1]) */
@@ -198,7 +196,7 @@ void Deg_DrawDegreeLogoAndNameWithLink (struct Deg_Degree *Deg,Act_Action_t Acti
       Deg_PutParamDegCod (Deg->DegCod);
 
       /***** Link to action *****/
-      HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Deg->FullName),ClassLink,NULL);
+      HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Deg->FullName),ClassLink,NULL);
       Str_FreeStrings ();
 
 	 /***** Degree logo and name *****/
@@ -816,15 +814,13 @@ static void Deg_ListOneDegreeForSeeing (struct Deg_Degree *Deg,unsigned NumDeg)
 
    if (Deg->Status & Hie_STATUS_BIT_PENDING)
      {
-      TxtClassNormal = The_ClassDatLight[Gbl.Prefs.Theme];
-      TxtClassStrong = Str_BuildString ("BT_LINK LT %s",
-                                        The_ClassDatLight[Gbl.Prefs.Theme]);
+      TxtClassNormal =
+      TxtClassStrong = The_ClassDatLight[Gbl.Prefs.Theme];
      }
    else
      {
       TxtClassNormal = The_ClassDat[Gbl.Prefs.Theme];
-      TxtClassStrong = Str_BuildString ("BT_LINK LT %s",
-                                        The_ClassDatStrong[Gbl.Prefs.Theme]);
+      TxtClassStrong = The_ClassDatStrong[Gbl.Prefs.Theme];
      }
    BgColor = (Deg->DegCod == Gbl.Hierarchy.Deg.DegCod) ? The_ClassBgHighlight[Gbl.Prefs.Theme] :
                                                          Gbl.ColorRows[Gbl.RowEvenOdd];
@@ -847,9 +843,9 @@ static void Deg_ListOneDegreeForSeeing (struct Deg_Degree *Deg,unsigned NumDeg)
       HTM_TD_End ();
 
       /***** Degree logo and name *****/
-      HTM_TD_Begin ("class=\"LM %s\"",BgColor);
+      HTM_TD_Begin ("class=\"%s LM %s\"",TxtClassStrong,BgColor);
 	 Deg_DrawDegreeLogoAndNameWithLink (Deg,ActSeeCrs,
-					    TxtClassStrong,"CM");
+					    "BT_LINK","CM");
       HTM_TD_End ();
 
       /***** Type of degree *****/
diff --git a/swad_degree_config.c b/swad_degree_config.c
index f79fba79..27886732 100644
--- a/swad_degree_config.c
+++ b/swad_degree_config.c
@@ -242,7 +242,7 @@ static void DegCfg_Center (bool PrintView,bool PutForm)
 	      {
 	       Frm_BeginFormGoTo (ActSeeCtrInf);
 		  Ctr_PutParamCtrCod (Gbl.Hierarchy.Ctr.CtrCod);
-		  HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Ctr.ShrtName),
+		  HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Ctr.ShrtName),
 					   Str_BuildString ("BT_LINK LT %s",
 					                    The_ClassDat[Gbl.Prefs.Theme]),
 					   NULL);
@@ -329,14 +329,12 @@ static void DegCfg_NumCrss (void)
       Frm_LabelColumn ("RT",NULL,Txt_Courses);
 
       /* Data */
-      HTM_TD_Begin ("class=\"LB\"");
+      HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
 	 Frm_BeginFormGoTo (ActSeeCrs);
 	    Deg_PutParamDegCod (Gbl.Hierarchy.Deg.DegCod);
-	    HTM_BUTTON_SUBMIT_Begin (Str_BuildString (Txt_Courses_of_DEGREE_X,
+	    HTM_BUTTON_OnSubmit_Begin (Str_BuildString (Txt_Courses_of_DEGREE_X,
 						      Gbl.Hierarchy.Deg.ShrtName),
-				     Str_BuildString ("BT_LINK %s",
-				                      The_ClassDat[Gbl.Prefs.Theme]),
-				     NULL);
+				       "BT_LINK",NULL);
 	    Str_FreeStrings ();
 	       HTM_Unsigned (Crs_GetCachedNumCrssInDeg (Gbl.Hierarchy.Deg.DegCod));
 	    HTM_BUTTON_End ();
diff --git a/swad_degree_type.c b/swad_degree_type.c
index 22755837..53ef51c7 100644
--- a/swad_degree_type.c
+++ b/swad_degree_type.c
@@ -542,8 +542,8 @@ static void DegTyp_PutHeadDegreeTypesForSeeing (Act_Action_t NextAction,
 	       Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
 
 	       /* Link with the head of this column */
-	       HTM_BUTTON_SUBMIT_Begin (Txt_DEGREE_TYPES_HELP_ORDER[Order],
-	                                "BT_LINK TIT_TBL",NULL);
+	       HTM_BUTTON_OnSubmit_Begin (Txt_DEGREE_TYPES_HELP_ORDER[Order],
+	                                  "BT_LINK TIT_TBL",NULL);
 		  if (Order == SelectedOrder)
 		     HTM_U_Begin ();
 		  HTM_Txt (Txt_DEGREE_TYPES_ORDER[Order]);
diff --git a/swad_department.c b/swad_department.c
index be2c30c7..1b68edfb 100644
--- a/swad_department.c
+++ b/swad_department.c
@@ -146,12 +146,13 @@ void Dpt_SeeDepts (void)
 
 	       Frm_BeginForm (ActSeeDpt);
 		  Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-		  HTM_BUTTON_SUBMIT_Begin (Txt_DEPARTMENTS_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
-		  if (Order == Departments.SelectedOrder)
-		     HTM_U_Begin ();
-		  HTM_Txt (Txt_DEPARTMENTS_ORDER[Order]);
-		  if (Order == Departments.SelectedOrder)
-		     HTM_U_End ();
+		  HTM_BUTTON_OnSubmit_Begin (Txt_DEPARTMENTS_HELP_ORDER[Order],
+		                             "BT_LINK TIT_TBL",NULL);
+		     if (Order == Departments.SelectedOrder)
+			HTM_U_Begin ();
+		     HTM_Txt (Txt_DEPARTMENTS_ORDER[Order]);
+		     if (Order == Departments.SelectedOrder)
+			HTM_U_End ();
 		  HTM_BUTTON_End ();
 	       Frm_EndForm ();
 
diff --git a/swad_enrolment.c b/swad_enrolment.c
index 2b93dbbf..7645371e 100644
--- a/swad_enrolment.c
+++ b/swad_enrolment.c
@@ -2229,7 +2229,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
 		     HTM_TD_End ();
 
 		     /***** Link to course *****/
-		     HTM_TD_Begin (NULL);
+		     HTM_TD_Begin ("%s LT",The_ClassDat[Gbl.Prefs.Theme]);
 
 			Crs_GetDataOfCourseByCod (&Crs);
 			Deg.DegCod = Crs.DegCod;
@@ -2237,10 +2237,8 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
 
 			Frm_BeginFormGoTo (ActSeeCrsInf);
 			   Crs_PutParamCrsCod (Crs.CrsCod);
-			   HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Crs.FullName),
-						    Str_BuildString ("BT_LINK LT %s",
-						                     The_ClassDat[Gbl.Prefs.Theme]),
-						    NULL);
+			   HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Crs.FullName),
+						      "BT_LINK",NULL);
 			   Str_FreeStrings ();
 			      HTM_TxtF ("%s &gt; %s",Deg.ShrtName,Crs.ShrtName);
 			   HTM_BUTTON_End ();
diff --git a/swad_exam.c b/swad_exam.c
index 00bcbd2a..c72a6603 100644
--- a/swad_exam.c
+++ b/swad_exam.c
@@ -260,7 +260,8 @@ static void Exa_ListAllExams (struct Exa_Exams *Exams)
 		     Frm_BeginForm (ActSeeAllExa);
 			Pag_PutHiddenParamPagNum (Pag_EXAMS,Exams->CurrentPage);
 			Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-			HTM_BUTTON_SUBMIT_Begin (Txt_EXAMS_ORDER_HELP[Order],"BT_LINK TIT_TBL",NULL);
+			HTM_BUTTON_OnSubmit_Begin (Txt_EXAMS_ORDER_HELP[Order],
+			                           "BT_LINK TIT_TBL",NULL);
 			   if (Order == Exams->SelectedOrder)
 			      HTM_U_Begin ();
 			   HTM_Txt (Txt_EXAMS_ORDER[Order]);
@@ -549,10 +550,10 @@ static void Exa_ShowOneExam (struct Exa_Exams *Exams,
       HTM_ARTICLE_Begin (Anchor);
 	 Frm_BeginForm (ActSeeExa);
 	    Exa_PutParams (Exams);
-	    HTM_BUTTON_SUBMIT_Begin (Txt_View_exam,
-				     Exam->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT":
-						    "BT_LINK LT ASG_TITLE",
-				     NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Txt_View_exam,
+				       Exam->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT":
+						      "BT_LINK LT ASG_TITLE",
+				       NULL);
 	       HTM_Txt (Exam->Title);
 	    HTM_BUTTON_End ();
 	 Frm_EndForm ();
@@ -580,10 +581,10 @@ static void Exa_ShowOneExam (struct Exa_Exams *Exams,
       Exams->ExaCod = Exam->ExaCod;
       Frm_BeginForm (ActSeeExa);
 	 Exa_PutParams (Exams);
-	 HTM_BUTTON_SUBMIT_Begin (Txt_Sessions,
-				  Exam->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT" :
-						 "BT_LINK LT ASG_TITLE",
-				  NULL);
+	 HTM_BUTTON_OnSubmit_Begin (Txt_Sessions,
+				    Exam->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT" :
+						   "BT_LINK LT ASG_TITLE",
+				    NULL);
 	    if (ShowOnlyThisExam)
 	       HTM_TxtColonNBSP (Txt_Sessions);
 	    HTM_Unsigned (Exam->NumSess);
diff --git a/swad_exam_session.c b/swad_exam_session.c
index 3cd48c6b..0ffdc937 100644
--- a/swad_exam_session.c
+++ b/swad_exam_session.c
@@ -525,19 +525,19 @@ static void ExaSes_ListOneOrMoreSessionsTitleGrps (struct Exa_Exams *Exams,
 	    Frm_BeginForm (ActSeeExaPrn);
 	       Exa_PutParams (Exams);
 	       ExaSes_PutParamSesCod (Session->SesCod);
-	       HTM_BUTTON_SUBMIT_Begin (Gbl.Usrs.Me.Role.Logged == Rol_STD ? Txt_Play :
-									     Txt_Resume,
-					Session->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT":
-							  "BT_LINK LT ASG_TITLE",
-					NULL);
+	       HTM_BUTTON_OnSubmit_Begin (Gbl.Usrs.Me.Role.Logged == Rol_STD ? Txt_Play :
+									       Txt_Resume,
+					  Session->Hidden ? "BT_LINK ASG_TITLE_LIGHT":
+							    "BT_LINK ASG_TITLE",
+					  NULL);
 		  HTM_Txt (Session->Title);
 	       HTM_BUTTON_End ();
 	    Frm_EndForm ();
 	   }
 	 else
 	   {
-	    HTM_SPAN_Begin ("class=\"%s\"",Session->Hidden ? "LT ASG_TITLE_LIGHT":
-							     "LT ASG_TITLE");
+	    HTM_SPAN_Begin ("class=\"%s\"",Session->Hidden ? "ASG_TITLE_LIGHT":
+							     "ASG_TITLE");
 	       HTM_Txt (Session->Title);
 	    HTM_SPAN_End ();
 	   }
diff --git a/swad_figure.c b/swad_figure.c
index 2e97a483..7a44354a 100644
--- a/swad_figure.c
+++ b/swad_figure.c
@@ -1256,7 +1256,7 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
 		     /* Icon and name of this institution */
 		     Frm_BeginForm (ActSeeInsInf);
 			Ins_PutParamInsCod (Ins.InsCod);
-			HTM_BUTTON_SUBMIT_Begin (Ins.ShrtName,The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL);
+			HTM_BUTTON_OnSubmit_Begin (Ins.ShrtName,The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL);
 			   if (Gbl.Usrs.Listing.WithPhotos)
 			     {
 			      Lgo_DrawLogo (HieLvl_INS,Ins.InsCod,Ins.ShrtName,
diff --git a/swad_follow.c b/swad_follow.c
index e2f55239..95ce9a91 100644
--- a/swad_follow.c
+++ b/swad_follow.c
@@ -200,7 +200,8 @@ void Fol_SuggestUsrsToFollowMainZoneOnRightColumn (void)
 
 	 /***** Title with link to suggest more users to follow *****/
 	 Frm_BeginForm (ActSeeSocPrf);
-	    HTM_BUTTON_SUBMIT_Begin (Txt_Who_to_follow,"BT_LINK CONNECTED_TXT",NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Txt_Who_to_follow,
+	                               "BT_LINK CONNECTED_TXT",NULL);
 	       HTM_Txt (Txt_Who_to_follow);
 	    HTM_BUTTON_End ();
 	 Frm_EndForm ();
@@ -401,10 +402,10 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
 	 /* Form to list users */
 	 Frm_BeginFormAnchor (Action,Fol_FOLLOW_SECTION_ID);
 	    Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
-	    HTM_BUTTON_SUBMIT_Begin (Title,
-				     (Gbl.Action.Act == Action) ? "BT_LINK FOLLOW_NUM_B" :
-								  "BT_LINK FOLLOW_NUM",
-				     NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Title,
+				       (Gbl.Action.Act == Action) ? "BT_LINK FOLLOW_NUM_B" :
+								    "BT_LINK FOLLOW_NUM",
+				       NULL);
 	}
       else
 	 HTM_SPAN_Begin ("class=\"%s\"",(Gbl.Action.Act == Action) ? "FOLLOW_NUM_B" :
@@ -427,7 +428,7 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
 	    /* Form to list users */
 	    Frm_BeginFormAnchor (Action,Fol_FOLLOW_SECTION_ID);
 	       Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
-	       HTM_BUTTON_SUBMIT_Begin (Title,
+	       HTM_BUTTON_OnSubmit_Begin (Title,
 					(Gbl.Action.Act == Action) ? The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme] :
 								     The_ClassFormLinkOutBox    [Gbl.Prefs.Theme],
 					NULL);
@@ -639,12 +640,10 @@ static void Fol_ShowFollowedOrFollower (struct UsrData *UsrDat)
 	 /* Put form to go to public profile */
 	 Frm_BeginForm (ActSeeOthPubPrf);
 	    Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
-	    HTM_DIV_Begin ("class=\"FOLLOW_USR_NAME\"");	// Limited width
-	       HTM_BUTTON_SUBMIT_Begin (Txt_Another_user_s_profile,
-	                                Str_BuildString ("BT_LINK LT %s",
-	                                                 The_ClassDat[Gbl.Prefs.Theme]),
-	                                NULL);
-	       Str_FreeStrings ();
+	    HTM_DIV_Begin ("class=\"FOLLOW_USR_NAME %s LT\"",	// Limited width
+	                   The_ClassDat[Gbl.Prefs.Theme]);
+	       HTM_BUTTON_OnSubmit_Begin (Txt_Another_user_s_profile,
+	                                  "BT_LINK",NULL);
 		  Usr_WriteFirstNameBRSurnames (UsrDat);
 	       HTM_BUTTON_End ();
 	    HTM_DIV_End ();
@@ -705,8 +704,8 @@ static void Fol_WriteRowUsrToFollowOnRightColumn (struct UsrData *UsrDat)
 	    Frm_BeginForm (ActSeeOthPubPrf);
 	       Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
 	       HTM_DIV_Begin ("class=\"CON_NAME_FOLLOW\"");	// Limited width
-		  HTM_BUTTON_SUBMIT_Begin (Txt_Another_user_s_profile,
-		                           "BT_LINK CON_NAME_FOLLOW CON_CRS",NULL);
+		  HTM_BUTTON_OnSubmit_Begin (Txt_Another_user_s_profile,
+		                             "BT_LINK CON_CRS",NULL);
 		     Usr_WriteFirstNameBRSurnames (UsrDat);
 		  HTM_BUTTON_End ();
 	       HTM_DIV_End ();
diff --git a/swad_forum.c b/swad_forum.c
index 6a310a4f..ad429958 100644
--- a/swad_forum.c
+++ b/swad_forum.c
@@ -1729,7 +1729,7 @@ static void For_WriteLinkToForum (const struct For_Forums *Forums,
 				   -1L,
 				   -1L);
 
-      HTM_BUTTON_SUBMIT_Begin (Act_GetActionText (For_ActionsSeeFor[Forum->Type]),
+      HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (For_ActionsSeeFor[Forum->Type]),
 			       Class,NULL);
 
 	 For_SetForumName (Forum,ForumName,Gbl.Prefs.Language,true);
@@ -2062,7 +2062,8 @@ static void For_ShowForumThreadsHighlightingOneThread (struct For_Forums *Forums
 							Forums->Forum.Location,
 							-1L,
 							-1L);
-			   HTM_BUTTON_SUBMIT_Begin (Txt_FORUM_THREAD_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
+			   HTM_BUTTON_OnSubmit_Begin (Txt_FORUM_THREAD_HELP_ORDER[Order],
+			                              "BT_LINK TIT_TBL",NULL);
 			      if (Order == Forums->ThreadsOrder)
 				 HTM_U_Begin ();
 			      HTM_Txt (Txt_FORUM_THREAD_ORDER[Order]);
diff --git a/swad_game.c b/swad_game.c
index 5543b6ab..f1479fdd 100644
--- a/swad_game.c
+++ b/swad_game.c
@@ -283,7 +283,8 @@ static void Gam_ListAllGames (struct Gam_Games *Games)
 			Pag_PutHiddenParamPagNum (Pag_GAMES,Games->CurrentPage);
 			Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
 
-			HTM_BUTTON_SUBMIT_Begin (Txt_GAMES_ORDER_HELP[Order],"BT_LINK TIT_TBL",NULL);
+			HTM_BUTTON_OnSubmit_Begin (Txt_GAMES_ORDER_HELP[Order],
+			                           "BT_LINK TIT_TBL",NULL);
 			   if (Order == Games->SelectedOrder)
 			      HTM_U_Begin ();
 			   HTM_Txt (Txt_GAMES_ORDER[Order]);
@@ -600,10 +601,10 @@ static void Gam_ShowOneGame (struct Gam_Games *Games,
       HTM_ARTICLE_Begin (Anchor);
 	 Frm_BeginForm (ActSeeGam);
 	    Gam_PutParams (Games);
-	    HTM_BUTTON_SUBMIT_Begin (Txt_View_game,
-				     Game->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT":
-						    "BT_LINK LT ASG_TITLE",
-				     NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Txt_View_game,
+				       Game->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT":
+						      "BT_LINK LT ASG_TITLE",
+				       NULL);
 	       HTM_Txt (Game->Title);
 	    HTM_BUTTON_End ();
 	 Frm_EndForm ();
@@ -631,10 +632,10 @@ static void Gam_ShowOneGame (struct Gam_Games *Games,
       Games->GamCod = Game->GamCod;
       Frm_BeginForm (ActSeeGam);
 	 Gam_PutParams (Games);
-	 HTM_BUTTON_SUBMIT_Begin (Txt_Matches,
-				  Game->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT" :
-						 "BT_LINK LT ASG_TITLE",
-				  NULL);
+	 HTM_BUTTON_OnSubmit_Begin (Txt_Matches,
+				    Game->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT" :
+						   "BT_LINK LT ASG_TITLE",
+				    NULL);
 	    if (ShowOnlyThisGame)
 	       HTM_TxtColonNBSP (Txt_Matches);
 	    HTM_Unsigned (Game->NumMchs);
diff --git a/swad_hierarchy.c b/swad_hierarchy.c
index ca43105e..ba5959f1 100644
--- a/swad_hierarchy.c
+++ b/swad_hierarchy.c
@@ -186,11 +186,6 @@ void Hie_WriteHierarchyInBreadcrumb (void)
    extern const char *Txt_Center;
    extern const char *Txt_Degree;
    const char *ClassTxt = The_ClassBreadcrumb[Gbl.Prefs.Theme];
-   char *ClassLink;
-
-   /***** Create CSS class of links *****/
-   if (asprintf (&ClassLink,"BT_LINK %s",ClassTxt) < 0)
-      Err_NotEnoughMemoryExit ();
 
    /***** Form to go to the system *****/
    HTM_DIV_Begin ("class=\"BC %s\"",ClassTxt);
@@ -199,7 +194,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
 
       Frm_BeginFormGoTo (ActMnu);
 	 Par_PutHiddenParamUnsigned (NULL,"NxtTab",(unsigned) TabSys);
-	 HTM_BUTTON_SUBMIT_Begin (Txt_System,ClassLink,NULL);
+	 HTM_BUTTON_OnSubmit_Begin (Txt_System,"BT_LINK",NULL);
 	    HTM_Txt (Txt_System);
 	 HTM_BUTTON_End ();
       Frm_EndForm ();
@@ -216,7 +211,8 @@ void Hie_WriteHierarchyInBreadcrumb (void)
 	 /***** Form to go to see institutions of this country *****/
 	 Frm_BeginFormGoTo (ActSeeIns);
 	    Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod);
-	    HTM_BUTTON_SUBMIT_Begin (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language],ClassLink,NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language],
+	                               "BT_LINK",NULL);
 	       HTM_Txt (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]);
 	    HTM_BUTTON_End ();
 	 Frm_EndForm ();
@@ -232,7 +228,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
 
 	 /***** Form to go to select countries *****/
 	 Frm_BeginFormGoTo (ActSeeCty);
-	    HTM_BUTTON_SUBMIT_Begin (Txt_Country,ClassLink,NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Txt_Country,"BT_LINK",NULL);
 	       HTM_Txt (Txt_Country);
 	    HTM_BUTTON_End ();
 	 Frm_EndForm ();
@@ -250,7 +246,8 @@ void Hie_WriteHierarchyInBreadcrumb (void)
 	 /***** Form to see centers of this institution *****/
 	 Frm_BeginFormGoTo (ActSeeCtr);
 	    Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod);
-	    HTM_BUTTON_SUBMIT_Begin (Gbl.Hierarchy.Ins.FullName,ClassLink,NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Gbl.Hierarchy.Ins.FullName,
+	                               "BT_LINK",NULL);
 	       HTM_Txt (Gbl.Hierarchy.Ins.ShrtName);
 	    HTM_BUTTON_End ();
 	 Frm_EndForm ();
@@ -266,7 +263,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
 
 	 /***** Form to go to select institutions *****/
 	 Frm_BeginFormGoTo (ActSeeIns);
-	    HTM_BUTTON_SUBMIT_Begin (Txt_Institution,ClassLink,NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Txt_Institution,"BT_LINK",NULL);
 	       HTM_Txt (Txt_Institution);
 	    HTM_BUTTON_End ();
 	 Frm_EndForm ();
@@ -296,7 +293,8 @@ void Hie_WriteHierarchyInBreadcrumb (void)
 	 /***** Form to see degrees of this center *****/
 	 Frm_BeginFormGoTo (ActSeeDeg);
 	    Ctr_PutParamCtrCod (Gbl.Hierarchy.Ctr.CtrCod);
-	    HTM_BUTTON_SUBMIT_Begin (Gbl.Hierarchy.Ctr.FullName,ClassLink,NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Gbl.Hierarchy.Ctr.FullName,
+	                               "BT_LINK",NULL);
 	       HTM_Txt (Gbl.Hierarchy.Ctr.ShrtName);
 	    HTM_BUTTON_End ();
 	 Frm_EndForm ();
@@ -312,7 +310,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
 
 	 /***** Form to go to select centers *****/
 	 Frm_BeginFormGoTo (ActSeeCtr);
-	    HTM_BUTTON_SUBMIT_Begin (Txt_Center,ClassLink,NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Txt_Center,"BT_LINK",NULL);
 	       HTM_Txt (Txt_Center);
 	    HTM_BUTTON_End ();
 	 Frm_EndForm ();
@@ -342,7 +340,8 @@ void Hie_WriteHierarchyInBreadcrumb (void)
 	 /***** Form to go to see courses of this degree *****/
 	 Frm_BeginFormGoTo (ActSeeCrs);
 	    Deg_PutParamDegCod (Gbl.Hierarchy.Deg.DegCod);
-	    HTM_BUTTON_SUBMIT_Begin (Gbl.Hierarchy.Deg.FullName,ClassLink,NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Gbl.Hierarchy.Deg.FullName,
+	                               "BT_LINK",NULL);
 	       HTM_Txt (Gbl.Hierarchy.Deg.ShrtName);
 	    HTM_BUTTON_End ();
 	 Frm_EndForm ();
@@ -358,7 +357,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
 
 	 /***** Form to go to select degrees *****/
 	 Frm_BeginFormGoTo (ActSeeDeg);
-	    HTM_BUTTON_SUBMIT_Begin (Txt_Degree,ClassLink,NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Txt_Degree,"BT_LINK",NULL);
 	       HTM_Txt (Txt_Degree);
 	    HTM_BUTTON_End ();
 	 Frm_EndForm ();
@@ -388,9 +387,6 @@ void Hie_WriteHierarchyInBreadcrumb (void)
       HTM_Txt ("&nbsp;&gt;&nbsp;");
 
    HTM_DIV_End ();
-
-   /***** Free memory used for CSS class of links *****/
-   free (ClassLink);
   }
 
 /*****************************************************************************/
diff --git a/swad_hierarchy_config.c b/swad_hierarchy_config.c
index dba615f8..1cbcc2d8 100644
--- a/swad_hierarchy_config.c
+++ b/swad_hierarchy_config.c
@@ -261,16 +261,15 @@ void HieCfg_NumCtrs (unsigned NumCtrs,bool PutForm)
       Frm_LabelColumn ("RT",NULL,Txt_Centers);
 
       /* Data */
-      HTM_TD_Begin ("class=\"LB\"");
+      HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
 	 if (PutForm)
 	   {
 	    Frm_BeginFormGoTo (ActSeeCtr);
 	       Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod);
-	       HTM_BUTTON_SUBMIT_Begin (Str_BuildString (Txt_Centers_of_INSTITUTION_X,
-							 Gbl.Hierarchy.Ins.ShrtName),
-	                                Str_BuildString ("BT_LINK %s",
-	                                                 The_ClassDat[Gbl.Prefs.Theme]),
-					NULL);
+	       HTM_BUTTON_OnSubmit_Begin (Str_BuildString (Txt_Centers_of_INSTITUTION_X,
+							   Gbl.Hierarchy.Ins.ShrtName),
+	                                  "BT_LINK",
+					  NULL);
 	       Str_FreeStrings ();
 	   }
 	 HTM_Unsigned (NumCtrs);
diff --git a/swad_holiday.c b/swad_holiday.c
index 2b4770f3..965bd11f 100644
--- a/swad_holiday.c
+++ b/swad_holiday.c
@@ -134,10 +134,11 @@ void Hld_SeeHolidays (void)
 		       Order <= Hld_ORDER_BY_START_DATE;
 		       Order++)
 		    {
-		     HTM_TH_Begin (1,1,"LM");
+		     HTM_TH_Begin (1,1,"TIT_TBL LM");
 			Frm_BeginForm (ActSeeHld);
 			   Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-			   HTM_BUTTON_SUBMIT_Begin (Txt_HOLIDAYS_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
+			   HTM_BUTTON_OnSubmit_Begin (Txt_HOLIDAYS_HELP_ORDER[Order],
+			                              "BT_LINK",NULL);
 			      if (Order == Holidays.SelectedOrder)
 				 HTM_U_Begin ();
 			      HTM_Txt (Txt_HOLIDAYS_ORDER[Order]);
diff --git a/swad_info.c b/swad_info.c
index 17328e6e..e5b692ce 100644
--- a/swad_info.c
+++ b/swad_info.c
@@ -539,7 +539,7 @@ void Inf_WriteMsgYouMustReadInfo (void)
 		 {
 		  HTM_LI_Begin (NULL);
 		     Frm_BeginForm (Inf_ActionsSeeInfo[InfoType]);
-			HTM_BUTTON_SUBMIT_Begin (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]),
+			HTM_BUTTON_OnSubmit_Begin (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]),
 						 The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL);
 			   HTM_Txt (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]));
 			HTM_BUTTON_End ();
diff --git a/swad_institution.c b/swad_institution.c
index a0c7b1eb..48dff77e 100644
--- a/swad_institution.c
+++ b/swad_institution.c
@@ -164,14 +164,11 @@ void Ins_SeeInsWithPendingCtrs (void)
 	    Ins_GetDataOfInstitByCod (&Ins);
 
 	    /* Institution logo and name */
-	    HTM_TR_Begin (NULL);
+	    HTM_TR_Begin ("%s",The_ClassDat[Gbl.Prefs.Theme]);
 
 	       HTM_TD_Begin ("class=\"LM %s\"",BgColor);
 		  Ins_DrawInstitutionLogoAndNameWithLink (&Ins,ActSeeCtr,
-							  Str_BuildString ("BT_LINK %s NOWRAP",
-							                   The_ClassDat[Gbl.Prefs.Theme]),
-							  "CM");
-		  Str_FreeStrings ();
+							  "BT_LINK NOWRAP","CM");
 	       HTM_TD_End ();
 
 	       /* Number of pending centers (row[1]) */
@@ -207,7 +204,7 @@ void Ins_DrawInstitutionLogoWithLink (struct Ins_Instit *Ins,unsigned Size)
      {
       Frm_BeginForm (ActSeeInsInf);
 	 Ins_PutParamInsCod (Ins->InsCod);
-	 HTM_BUTTON_SUBMIT_Begin (Ins->FullName,"BT_LINK",NULL);
+	 HTM_BUTTON_OnSubmit_Begin (Ins->FullName,"BT_LINK",NULL);
      }
    Lgo_DrawLogo (HieLvl_INS,Ins->InsCod,Ins->FullName,
 		 Size,NULL,true);
@@ -230,7 +227,7 @@ void Ins_DrawInstitutionLogoAndNameWithLink (struct Ins_Instit *Ins,Act_Action_t
       Ins_PutParamInsCod (Ins->InsCod);
 
       /***** Link to action *****/
-      HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Ins->FullName),ClassLink,NULL);
+      HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Ins->FullName),ClassLink,NULL);
       Str_FreeStrings ();
 
 	 /***** Institution logo and name *****/
@@ -373,15 +370,13 @@ static void Ins_ListOneInstitutionForSeeing (struct Ins_Instit *Ins,unsigned Num
 
    if (Ins->Status & Hie_STATUS_BIT_PENDING)
      {
-      TxtClassNormal = The_ClassDatLight[Gbl.Prefs.Theme];
-      TxtClassStrong = Str_BuildString ("BT_LINK LT %s",
-                                        The_ClassDatLight[Gbl.Prefs.Theme]);
+      TxtClassNormal =
+      TxtClassStrong = The_ClassDatLight[Gbl.Prefs.Theme];
      }
    else
      {
       TxtClassNormal = The_ClassDat[Gbl.Prefs.Theme];
-      TxtClassStrong = Str_BuildString ("BT_LINK LT %s",
-                                        The_ClassDatStrong[Gbl.Prefs.Theme]);
+      TxtClassStrong = The_ClassDatStrong[Gbl.Prefs.Theme];
      }
    BgColor = (Ins->InsCod == Gbl.Hierarchy.Ins.InsCod) ? The_ClassBgHighlight[Gbl.Prefs.Theme] :
                                                          Gbl.ColorRows[Gbl.RowEvenOdd];
@@ -396,7 +391,7 @@ static void Ins_ListOneInstitutionForSeeing (struct Ins_Instit *Ins,unsigned Num
       /***** Institution logo and name *****/
       HTM_TD_Begin ("class=\"LM %s\"",BgColor);
 	 Ins_DrawInstitutionLogoAndNameWithLink (Ins,ActSeeCtr,
-						 TxtClassStrong,"CM");
+						 "BT_LINK","CM");
       HTM_TD_End ();
 
       /***** Number of users who claim to belong to this institution *****/
@@ -458,13 +453,8 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
    Ins_Order_t Order;
    static const char *ClassTH[Ins_NUM_ORDERS] =
      {
-      [Ins_ORDER_BY_INSTITUTION] = "LM",
-      [Ins_ORDER_BY_NUM_USRS   ] = "RM"
-     };
-   static const char *ClassButton[Ins_NUM_ORDERS] =
-     {
-      [Ins_ORDER_BY_INSTITUTION] = "BT_LINK LM TIT_TBL",
-      [Ins_ORDER_BY_NUM_USRS   ] = "BT_LINK RM TIT_TBL"
+      [Ins_ORDER_BY_INSTITUTION] = "TIT_TBL LM",
+      [Ins_ORDER_BY_NUM_USRS   ] = "TIT_TBL RM"
      };
 
    HTM_TR_Begin (NULL);
@@ -479,7 +469,8 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
 	      {
 	       Frm_BeginForm (ActSeeIns);
 		  Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-		  HTM_BUTTON_SUBMIT_Begin (Txt_INSTITUTIONS_HELP_ORDER[Order],ClassButton[Order],NULL);
+		  HTM_BUTTON_OnSubmit_Begin (Txt_INSTITUTIONS_HELP_ORDER[Order],
+		                             "BT_LINK",NULL);
 		     if (Order == Gbl.Hierarchy.Inss.SelectedOrder)
 			HTM_U_Begin ();
 	      }
diff --git a/swad_institution_config.c b/swad_institution_config.c
index c1aa6b45..ab152302 100644
--- a/swad_institution_config.c
+++ b/swad_institution_config.c
@@ -343,10 +343,8 @@ static void InsCfg_Country (bool PrintView,bool PutForm)
 	      {
 	       Frm_BeginFormGoTo (ActSeeCtyInf);
 		  Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod);
-		  HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]),
-					   Str_BuildString ("BT_LINK LT %s",
-					                    The_ClassDat[Gbl.Prefs.Theme]),
-					   NULL);
+		  HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]),
+					     "BT_LINK LT",NULL);
 		  Str_FreeStrings ();
 	      }
 	    Cty_DrawCountryMap (&Gbl.Hierarchy.Cty,"COUNTRY_MAP_TINY");
diff --git a/swad_layout.c b/swad_layout.c
index 8c378831..15678f58 100644
--- a/swad_layout.c
+++ b/swad_layout.c
@@ -1013,7 +1013,7 @@ static void Lay_WritePageTopHeading (void)
 	       HTM_DIV_End ();	// head_row_1_logo_big
 
 	       HTM_DIV_Begin ("id=\"head_row_1_tagline\"");
-		  HTM_BUTTON_SUBMIT_Begin (Txt_TAGLINE,The_ClassTagline[Gbl.Prefs.Theme],NULL);
+		  HTM_BUTTON_OnSubmit_Begin (Txt_TAGLINE,The_ClassTagline[Gbl.Prefs.Theme],NULL);
 		     HTM_Txt (Txt_TAGLINE_BR);
 		  HTM_BUTTON_End ();
 	       HTM_DIV_End ();	// head_row_1_tagline
@@ -1222,7 +1222,7 @@ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
 	 FuncParams (Args);
 
       /***** Put icon and text with link *****/
-      HTM_BUTTON_SUBMIT_Begin (Text,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],OnSubmit);
+      HTM_BUTTON_OnSubmit_Begin (Text,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],OnSubmit);
 	 Ico_PutIconTextLink (Icon,Color,Text);
       HTM_BUTTON_End ();
 
diff --git a/swad_link.c b/swad_link.c
index a1a9b735..db39f0d5 100644
--- a/swad_link.c
+++ b/swad_link.c
@@ -159,7 +159,7 @@ void Lnk_WriteMenuWithInstitutionalLinks (void)
       HTM_DIV_Begin ("id=\"institutional_links\"");
 
 	 Frm_BeginForm (ActSeeLnk);
-	    HTM_BUTTON_SUBMIT_Begin (Txt_Links,"BT_LINK LINK_TITLE",NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Txt_Links,"BT_LINK LINK_TITLE",NULL);
 	       HTM_TxtF ("%s",Txt_Links);
 	    HTM_BUTTON_End ();
 	 Frm_EndForm ();
diff --git a/swad_mail.c b/swad_mail.c
index 6f0b67d8..a3aac9a4 100644
--- a/swad_mail.c
+++ b/swad_mail.c
@@ -130,11 +130,12 @@ void Mai_SeeMailDomains (void)
 	   Order <= Mai_ORDER_BY_USERS;
 	   Order++)
 	{
-	 HTM_TH_Begin (1,1,"LM");
+	 HTM_TH_Begin (1,1,"TIT_TBL LM");
 
 	    Frm_BeginForm (ActSeeMai);
 	       Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-	       HTM_BUTTON_SUBMIT_Begin (Txt_EMAIL_DOMAIN_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
+	       HTM_BUTTON_OnSubmit_Begin (Txt_EMAIL_DOMAIN_HELP_ORDER[Order],
+	                                  "BT_LINK",NULL);
 		  if (Order == Gbl.Mails.SelectedOrder)
 		     HTM_U_Begin ();
 		  HTM_Txt (Txt_EMAIL_DOMAIN_ORDER[Order]);
diff --git a/swad_match.c b/swad_match.c
index ba7845fa..189dc6e3 100644
--- a/swad_match.c
+++ b/swad_match.c
@@ -639,9 +639,9 @@ static void Mch_ListOneOrMoreMatchesTitleGrps (const struct Mch_Match *Match,
 							     ActResMch);
 	    Mch_PutParamMchCod (Match->MchCod);
 
-	    HTM_BUTTON_SUBMIT_Begin (Gbl.Usrs.Me.Role.Logged == Rol_STD ? Txt_Play :
-									  Txt_Resume,
-				     "BT_LINK LT ASG_TITLE",NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Gbl.Usrs.Me.Role.Logged == Rol_STD ? Txt_Play :
+									    Txt_Resume,
+				       "BT_LINK LT ASG_TITLE",NULL);
 	       HTM_Txt (Match->Title);
 	    HTM_BUTTON_End ();
 
@@ -2325,7 +2325,7 @@ static void Mch_PutCountdownAndHourglassIcon (struct Mch_Match *Match)
    /***** Write countdown and put hourglass icon *****/
    HTM_DIV_Begin ("class=\"MCH_SHOW_HOURGLASS\"");
       HTM_DIV_Begin ("class=\"MCH_BIGBUTTON_CONT\"");
-	 HTM_BUTTON_BUTTON_Begin (Txt_Countdown,Class,NULL);
+	 HTM_BUTTON_OnClick_Begin (Txt_Countdown,Class,NULL);
 
 	    /* Countdown */
 	    if (Match->Status.Countdown > 0)
@@ -2384,15 +2384,13 @@ static void Mch_PutFormCountdown (struct Mch_Match *Match,long Seconds,const cha
      }
 
       /***** Put icon *****/
-      HTM_DIV_Begin ("class=\"MCH_SMALLBUTTON_CONT\"");
+      HTM_DIV_Begin ("class=\"MCH_SMALLBUTTON_CONT %s\"",Color);
 
-	 HTM_BUTTON_SUBMIT_Begin (PutForm ? Txt_Countdown :
-					    NULL,
-				  Str_BuildString (PutForm ? "BT_LINK MCH_BUTTON_ON %s" :
-							     "BT_LINK_OFF MCH_BUTTON_HIDDEN %s",
-						   Color),
-				  NULL);
-	 Str_FreeStrings ();
+	 HTM_BUTTON_OnSubmit_Begin (PutForm ? Txt_Countdown :
+					      NULL,
+				    PutForm ? "BT_LINK MCH_BUTTON_ON" :
+					      "BT_LINK_OFF MCH_BUTTON_HIDDEN",
+				    NULL);
 
 	    HTM_NBSP ();
 	    if (Seconds >= 0)
@@ -2694,18 +2692,15 @@ static void Mch_PutCheckboxResult (const struct Mch_Match *Match)
    extern const char *Txt_View_results;
 
    /***** Begin container *****/
-   HTM_DIV_Begin ("class=\"MCH_SHOW_RESULTS\"");
+   HTM_DIV_Begin ("class=\"MCH_SHOW_RESULTS %s\"",The_ClassDat[Gbl.Prefs.Theme]);
 
       /***** Begin form *****/
       Frm_BeginForm (ActChgVisResMchQst);
 	 Mch_PutParamMchCod (Match->MchCod);	// Current match being played
 
 	 /***** Put icon with link *****/
-	 HTM_BUTTON_SUBMIT_Begin (Txt_View_results,
-	                          Str_BuildString ("BT_LINK %s ICO_HIGHLIGHT",
-	                                           The_ClassDat[Gbl.Prefs.Theme]),
-	                          NULL);
-	 Str_FreeStrings ();
+	 HTM_BUTTON_OnSubmit_Begin (Txt_View_results,
+	                            "BT_LINK ICO_HIGHLIGHT",NULL);
 	    HTM_TxtF ("<i class=\"%s\"></i>",
 		      Match->Status.ShowQstResults ? "fas fa-toggle-on" :
 						     "fas fa-toggle-off");
@@ -2741,7 +2736,8 @@ static void Mch_PutIfAnswered (const struct Mch_Match *Match,bool Answered)
 	 Frm_BeginForm (ActSeeMchAnsQstStd);
 	    Mch_PutParamMchCod (Match->MchCod);	// Current match being played
 
-	    HTM_BUTTON_OnMouseDown_Begin (Txt_View_my_answer,"BT_LINK DAT_SMALL_GREEN");
+	    HTM_BUTTON_OnMouseDown_Begin (Txt_View_my_answer,
+	                                  "BT_LINK DAT_SMALL_GREEN");
 	       HTM_TxtF ("<i class=\"%s\"></i>","fas fa-check-circle");
 	       HTM_TxtF ("&nbsp;%s",Txt_MATCH_QUESTION_Answered);
 	    HTM_BUTTON_End ();
@@ -3305,7 +3301,7 @@ static void Mch_PutBigButton (Act_Action_t NextAction,const char *Id,
 
       /***** Put icon with link *****/
       HTM_DIV_Begin ("class=\"MCH_BIGBUTTON_CONT\"");
-	 HTM_BUTTON_SUBMIT_Begin (Txt,"BT_LINK MCH_BUTTON_ON ICO_BLACK",NULL);
+	 HTM_BUTTON_OnSubmit_Begin (Txt,"BT_LINK MCH_BUTTON_ON ICO_BLACK",NULL);
 	    HTM_TxtF ("<i class=\"%s\"></i>",Icon);
 	 HTM_BUTTON_End ();
       HTM_DIV_End ();
@@ -3322,7 +3318,7 @@ static void Mch_PutBigButtonHidden (const char *Icon)
   {
    /***** Put inactive icon *****/
    HTM_DIV_Begin ("class=\"MCH_BIGBUTTON_CONT\"");
-      HTM_BUTTON_BUTTON_Begin (NULL,"BT_LINK_OFF MCH_BUTTON_HIDDEN ICO_BLACK",
+      HTM_BUTTON_OnClick_Begin (NULL,"BT_LINK_OFF MCH_BUTTON_HIDDEN ICO_BLACK",
                                NULL);
 	 HTM_TxtF ("<i class=\"%s\"></i>",Icon);
       HTM_BUTTON_End ();
@@ -3338,8 +3334,8 @@ static void Mch_PutBigButtonClose (void)
 
    /***** Put icon with link *****/
    HTM_DIV_Begin ("class=\"MCH_BIGBUTTON_CONT\"");
-      HTM_BUTTON_BUTTON_Begin (Txt_Close,"BT_LINK MCH_BUTTON_ON ICO_DARKRED",
-                               "window.close();");
+      HTM_BUTTON_OnClick_Begin (Txt_Close,"BT_LINK MCH_BUTTON_ON ICO_DARKRED",
+                                "window.close();");
 	 HTM_TxtF ("<i class=\"%s\"></i>",Mch_ICON_CLOSE);
       HTM_BUTTON_End ();
    HTM_DIV_End ();
diff --git a/swad_menu.c b/swad_menu.c
index b68dc854..fd2745ef 100644
--- a/swad_menu.c
+++ b/swad_menu.c
@@ -261,10 +261,10 @@ void Mnu_WriteMenuThisTab (void)
 		  Frm_BeginForm (NumAct);
 
 		     /***** Begin link *****/
-		     HTM_BUTTON_SUBMIT_Begin (Title,
-					      IsTheSelectedAction ? "BT_LINK MENU_OPT_ON" :
-								    "BT_LINK MENU_OPT_OFF",
-					      NULL);
+		     HTM_BUTTON_OnSubmit_Begin (Title,
+					        IsTheSelectedAction ? "BT_LINK MENU_OPT_ON" :
+								      "BT_LINK MENU_OPT_OFF",
+					        NULL);
 
 			/***** Icon and text *****/
 			HTM_DIV_Begin ("class=\"MENU_ICO_TXT\"");
diff --git a/swad_message.c b/swad_message.c
index f0d499e8..c76a5b14 100644
--- a/swad_message.c
+++ b/swad_message.c
@@ -2278,11 +2278,11 @@ static void Msg_WriteSentOrReceivedMsgSubject (struct Msg_Messages *Messages,
 	 Messages->MsgCod = MsgCod;	// Message to be contracted/expanded
 	 Msg_PutHiddenParamsOneMsg (Messages);
 
-	 HTM_BUTTON_SUBMIT_Begin (Expanded ? Txt_Hide_message :
-					     Txt_See_message,
-				  Open ? "BT_LINK LT MSG_TIT" :
-					 "BT_LINK LT MSG_TIT_NEW",
-				  NULL);
+	 HTM_BUTTON_OnSubmit_Begin (Expanded ? Txt_Hide_message :
+					       Txt_See_message,
+				    Open ? "BT_LINK LT MSG_TIT" :
+					   "BT_LINK LT MSG_TIT_NEW",
+				    NULL);
 
 	    /***** Write subject *****/
 	    if (Subject[0])
@@ -2406,8 +2406,8 @@ static bool Msg_WriteCrsOrgMsg (long CrsCod)
 	       Crs_PutParamCrsCod (Crs.CrsCod);
 	       HTM_DIV_Begin ("class=\"AUTHOR_TXT\"");
 		  HTM_Txt ("(");
-		  HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Crs.FullName),
-					   "BT_LINK AUTHOR_TXT",NULL);
+		  HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Crs.FullName),
+					     "BT_LINK AUTHOR_TXT",NULL);
 		  Str_FreeStrings ();
 		     HTM_Txt (Crs.ShrtName);
 		  HTM_BUTTON_End ();
@@ -2684,7 +2684,8 @@ static void Msg_WriteMsgTo (struct Msg_Messages *Messages,long MsgCod)
 		     Messages->MsgCod = MsgCod;	// Message to be expanded with all recipients visible
 		     Msg_PutHiddenParamsOneMsg (Messages);
 		     Par_PutHiddenParamChar ("SeeAllRcpts",'Y');
-			HTM_BUTTON_SUBMIT_Begin (Txt_View_all_recipients,"BT_LINK AUTHOR_TXT",NULL);
+			HTM_BUTTON_OnSubmit_Begin (Txt_View_all_recipients,
+			                           "BT_LINK",NULL);
 			   HTM_TxtF (Txt_and_X_other_recipients,
 				     NumRecipients.Known - NumRecipients.ToShow);
 			HTM_BUTTON_End ();
diff --git a/swad_notice.c b/swad_notice.c
index a8da0509..63c35099 100644
--- a/swad_notice.c
+++ b/swad_notice.c
@@ -546,31 +546,37 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
                              long UsrCod,
                              Not_Status_t Status)
   {
+   extern const char *The_ClassNoticeTextColor[The_NUM_THEMES];
    extern const char *Txt_See_full_notice;
    static const char *ContainerClass[Not_NUM_STATUS] =
      {
-      [Not_ACTIVE_NOTICE  ] = "NOTICE_CONT_ACTIVE",
-      [Not_OBSOLETE_NOTICE] = "NOTICE_CONT_OBSOLETE",
+      [Not_ACTIVE_NOTICE  ] = "NOTICE_CONT",
+      [Not_OBSOLETE_NOTICE] = "NOTICE_CONT LIGHT",
      };
    static const char *ContainerWidthClass[Not_NUM_TYPES_LISTING] =
      {
       [Not_LIST_BRIEF_NOTICES] = "NOTICE_CONT_NARROW",
       [Not_LIST_FULL_NOTICES ] = "NOTICE_CONT_WIDE",
      };
-   static const char *DateClass[Not_NUM_STATUS] =
+   static const char *The_ClassNoticeDateColor[The_NUM_THEMES] =
      {
-      [Not_ACTIVE_NOTICE  ] = "NOTICE_DATE_ACTIVE",
-      [Not_OBSOLETE_NOTICE] = "NOTICE_DATE_OBSOLETE",
+      [The_THEME_WHITE ] = "NOTICE_DATE_WHITE",
+      [The_THEME_GREY  ] = "NOTICE_DATE_GREY",
+      [The_THEME_PURPLE] = "NOTICE_DATE_PURPLE",
+      [The_THEME_BLUE  ] = "NOTICE_DATE_BLUE",
+      [The_THEME_YELLOW] = "NOTICE_DATE_YELLOW",
+      [The_THEME_PINK  ] = "NOTICE_DATE_PINK",
+      [The_THEME_DARK  ] = "NOTICE_DATE_DARK",
      };
-   static const char *TextClass[Not_NUM_STATUS] =
+   static const char *The_ClassNoticeAuthorColor[The_NUM_THEMES] =
      {
-      [Not_ACTIVE_NOTICE  ] = "NOTICE_TEXT_ACTIVE",
-      [Not_OBSOLETE_NOTICE] = "NOTICE_TEXT_OBSOLETE",
-     };
-   static const char *AuthorClass[Not_NUM_STATUS] =
-     {
-      [Not_ACTIVE_NOTICE  ] = "NOTICE_AUTHOR_ACTIVE",
-      [Not_OBSOLETE_NOTICE] = "NOTICE_AUTHOR_OBSOLETE",
+      [The_THEME_WHITE ] = "NOTICE_AUTHOR_WHITE",
+      [The_THEME_GREY  ] = "NOTICE_AUTHOR_GREY",
+      [The_THEME_PURPLE] = "NOTICE_AUTHOR_PURPLE",
+      [The_THEME_BLUE  ] = "NOTICE_AUTHOR_BLUE",
+      [The_THEME_YELLOW] = "NOTICE_AUTHOR_YELLOW",
+      [The_THEME_PINK  ] = "NOTICE_AUTHOR_PINK",
+      [The_THEME_DARK  ] = "NOTICE_AUTHOR_DARK",
      };
    static unsigned UniqueId = 0;
    char *Id;
@@ -618,13 +624,14 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
 
       /* Write the date */
       UniqueId++;
-      HTM_DIV_Begin ("class=\"%s\"",DateClass[Status]);
+      HTM_DIV_Begin ("class=\"NOTICE_DATE %s\"",
+                     The_ClassNoticeDateColor[Gbl.Prefs.Theme]);
 	 if (TypeNoticesListing == Not_LIST_BRIEF_NOTICES)
 	   {
 	    /* Form to view full notice */
 	    Frm_BeginFormAnchor (ActSeeOneNot,Anchor);
 	       Not_PutHiddenParamNotCod (NotCod);
-	       HTM_BUTTON_SUBMIT_Begin (Txt_See_full_notice,"BT_LINK RT",NULL);
+	       HTM_BUTTON_OnSubmit_Begin (Txt_See_full_notice,"BT_LINK RT",NULL);
 	   }
 	 if (asprintf (&Id,"not_date_%u",UniqueId) < 0)
 	    Err_NotEnoughMemoryExit ();
@@ -644,7 +651,8 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
       /***** Write the content of the notice *****/
       if (TypeNoticesListing == Not_LIST_BRIEF_NOTICES)
 	{
-	 HTM_DIV_Begin ("class=\"NOTICE_TEXT_BRIEF\"");
+	 HTM_DIV_Begin ("class=\"NOTICE_TEXT_BRIEF %s\"",
+                        The_ClassNoticeTextColor[Gbl.Prefs.Theme]);
 	    HTM_Txt (Content);
 	 HTM_DIV_End ();
 
@@ -658,14 +666,15 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
 	}
       else
 	{
-	 HTM_DIV_Begin ("class=\"%s\"",TextClass[Status]);
-	    HTM_Txt (Content);
+         HTM_DIV_Begin ("class=\"NOTICE_TEXT %s\"",
+                        The_ClassNoticeTextColor[Gbl.Prefs.Theme]);
+            HTM_Txt (Content);
 	 HTM_DIV_End ();
 	}
 
       /***** Write the author *****/
       HTM_DIV_Begin ("class=\"NOTICE_AUTHOR %s\"",	// Limited width
-		     AuthorClass[Status]);
+                     The_ClassNoticeAuthorColor[Gbl.Prefs.Theme]);
 	 Usr_UsrDataConstructor (&UsrDat);
 	 UsrDat.UsrCod = UsrCod;
 	 if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat,	// Get author's data from database
diff --git a/swad_notification.c b/swad_notification.c
index 74dc88dc..5a5bca68 100644
--- a/swad_notification.c
+++ b/swad_notification.c
@@ -498,7 +498,7 @@ void Ntf_ShowMyNotifications (void)
 		     if (PutLink)
 		       {
 			PutLink = Ntf_StartFormGoToAction (NotifyEvent,Hie.Crs.CrsCod,&UsrDat,Cod,&Forums);
-			   HTM_BUTTON_SUBMIT_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassLink,NULL);
+			   HTM_BUTTON_OnSubmit_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassLink,NULL);
 			      HTM_Txt (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent]);
 			   HTM_BUTTON_End ();
 			Frm_EndForm ();
@@ -525,7 +525,7 @@ void Ntf_ShowMyNotifications (void)
 			   PutLink = Ntf_StartFormGoToAction (NotifyEvent,Hie.Crs.CrsCod,&UsrDat,Cod,&Forums);
 
 			if (PutLink)
-			   HTM_BUTTON_SUBMIT_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassLink,NULL);
+			   HTM_BUTTON_OnSubmit_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassLink,NULL);
 			else
 			   HTM_SPAN_Begin ("class=\"%s\"",ClassText);
 			HTM_TxtF ("%s:&nbsp;%s",Txt_Forum,ForumName);
@@ -543,7 +543,7 @@ void Ntf_ShowMyNotifications (void)
 			   PutLink = Ntf_StartFormGoToAction (NotifyEvent,Hie.Crs.CrsCod,&UsrDat,Cod,&Forums);
 
 			if (PutLink)
-			   HTM_BUTTON_SUBMIT_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassLink,NULL);
+			   HTM_BUTTON_OnSubmit_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassLink,NULL);
 			else
 			   HTM_SPAN_Begin ("class=\"%s\"",ClassText);
 
@@ -1640,7 +1640,7 @@ void Ntf_WriteNumberOfNewNtfs (void)
    Frm_BeginFormId (ActSeeNewNtf,"form_ntf");
 
       /***** Begin link *****/
-      HTM_BUTTON_SUBMIT_Begin (Txt_See_notifications,The_ClassNotif[Gbl.Prefs.Theme],NULL);
+      HTM_BUTTON_OnSubmit_Begin (Txt_See_notifications,The_ClassNotif[Gbl.Prefs.Theme],NULL);
 
 	 /***** Number of unseen notifications *****/
 	 HTM_SPAN_Begin ("id=\"notif_all\"");
diff --git a/swad_pagination.c b/swad_pagination.c
index 7ed9a0ce..a0a7aaa7 100644
--- a/swad_pagination.c
+++ b/swad_pagination.c
@@ -270,7 +270,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
 	       Err_NotEnoughMemoryExit ();
 	    if (asprintf (&Title,Txt_Page_X_of_Y,1,Pagination->NumPags) < 0)
 	       Err_NotEnoughMemoryExit ();
-	    HTM_BUTTON_SUBMIT_Begin (Title,ClassLink,NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Title,ClassLink,NULL);
 	    free (Title);
 	    free (ClassLink);
 	   }
@@ -395,7 +395,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
            }
 	    if (asprintf (&Title,Txt_Page_X_of_Y,1,Pagination->NumPags) < 0)
 	       Err_NotEnoughMemoryExit ();
-	    HTM_BUTTON_SUBMIT_Begin (Title,ClassLink,NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Title,ClassLink,NULL);
 	       HTM_Unsigned (1);
 	    HTM_BUTTON_End ();
 	    free (Title);
@@ -509,7 +509,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
 	    if (asprintf (&Title,Txt_Page_X_of_Y,
 			  Pagination->LeftPage,Pagination->NumPags) < 0)
 	       Err_NotEnoughMemoryExit ();
-	    HTM_BUTTON_SUBMIT_Begin (Title,ClassLink,NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Title,ClassLink,NULL);
 	       HTM_Unsigned (Pagination->LeftPage);
 	    HTM_BUTTON_End ();
 	    free (Title);
@@ -631,7 +631,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
 	       default:
 		  break;
               }
-	       HTM_BUTTON_SUBMIT_Begin (Title,ClassLink,NULL);
+	       HTM_BUTTON_OnSubmit_Begin (Title,ClassLink,NULL);
 		  HTM_Unsigned (NumPage);
 	       HTM_BUTTON_End ();
             Frm_EndForm ();
@@ -746,7 +746,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
 	    if (asprintf (&Title,Txt_Page_X_of_Y,
 			  Pagination->RightPage,Pagination->NumPags) < 0)
 	       Err_NotEnoughMemoryExit ();
-	    HTM_BUTTON_SUBMIT_Begin (Title,ClassLink,NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Title,ClassLink,NULL);
 	       HTM_Unsigned (Pagination->RightPage);
 	    HTM_BUTTON_End ();
 	    free (Title);
@@ -859,7 +859,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
 	    if (asprintf (&Title,Txt_Page_X_of_Y,
 			  Pagination->NumPags,Pagination->NumPags) < 0)
 	       Err_NotEnoughMemoryExit ();
-	    HTM_BUTTON_SUBMIT_Begin (Title,ClassLink,NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Title,ClassLink,NULL);
 	       HTM_Unsigned (Pagination->NumPags);
 	    HTM_BUTTON_End ();
 	    free (Title);
diff --git a/swad_photo.c b/swad_photo.c
index cbda9cd1..8dc86387 100644
--- a/swad_photo.c
+++ b/swad_photo.c
@@ -1284,7 +1284,7 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL,
       else
 	 Frm_BeginForm (ActSeeOthPubPrf);
       Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
-	 HTM_BUTTON_SUBMIT_Begin (NULL,"BT_LINK",NULL);
+	 HTM_BUTTON_OnSubmit_Begin (NULL,"BT_LINK",NULL);
      }
 
    /***** Hidden div to pass user's name to Javascript *****/
@@ -2256,13 +2256,8 @@ static void Pho_ShowOrPrintListDegrees (struct Pho_DegPhotos *DegPhotos,
 	                     The_ClassDat[Gbl.Prefs.Theme],
 	                     Gbl.ColorRows[Gbl.RowEvenOdd]);
 		  if (SeeOrPrint == Pho_DEGREES_SEE)
-		    {
 		     Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeDegInf,
-							Str_BuildString ("BT_LINK %s",
-							                 The_ClassDat[Gbl.Prefs.Theme]),
-							"CT");
-		     Str_FreeStrings ();
-		    }
+							"BT_LINK","CT");
 		  else	// Pho_DEGREES_PRINT
 		    {
 		     Lgo_DrawLogo (HieLvl_DEG,Deg.DegCod,Deg.ShrtName,20,"CT",true);
@@ -2391,7 +2386,8 @@ static void Pho_ShowDegreeAvgPhotoAndStat (const struct Deg_Degree *Deg,
      {
       Frm_BeginFormGoTo (ActSeeDegInf);
 	 Deg_PutParamDegCod (Deg->DegCod);
-	 HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Deg->FullName),"BT_LINK",NULL);
+	 HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Deg->FullName),
+	                            "BT_LINK",NULL);
 	 Str_FreeStrings ();
      }
 
diff --git a/swad_photo_shape.c b/swad_photo_shape.c
index 0d97966a..37f6c888 100644
--- a/swad_photo_shape.c
+++ b/swad_photo_shape.c
@@ -31,11 +31,13 @@
 
 #include "swad_action.h"
 #include "swad_config.h"
+#include "swad_error.h"
 #include "swad_figure.h"
 #include "swad_form.h"
 #include "swad_global.h"
 #include "swad_photo_shape.h"
 #include "swad_setting_database.h"
+#include "swad_user_database.h"
 
 /*****************************************************************************/
 /************** External global variables from others modules ****************/
diff --git a/swad_place.c b/swad_place.c
index c21a8f19..9445e093 100644
--- a/swad_place.c
+++ b/swad_place.c
@@ -128,11 +128,12 @@ void Plc_SeePlaces (void)
 		 Order <= (Plc_Order_t) (Plc_NUM_ORDERS - 1);
 		 Order++)
 	      {
-	       HTM_TH_Begin (1,1,"LM");
+	       HTM_TH_Begin (1,1,"TIT_TBL LM");
 
 		  Frm_BeginForm (ActSeePlc);
 		     Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-		     HTM_BUTTON_SUBMIT_Begin (Txt_PLACES_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
+		     HTM_BUTTON_OnSubmit_Begin (Txt_PLACES_HELP_ORDER[Order],
+		                                "BT_LINK",NULL);
 			if (Order == Places.SelectedOrder)
 			   HTM_U_Begin ();
 			HTM_Txt (Txt_PLACES_ORDER[Order]);
diff --git a/swad_profile.c b/swad_profile.c
index 0dc42dcb..e1a6bffb 100644
--- a/swad_profile.c
+++ b/swad_profile.c
@@ -858,7 +858,7 @@ static void Prf_ShowRanking (unsigned Rank,unsigned NumUsrs)
       if (asprintf (&Title,"#%u %s %u",
 		    Rank,Txt_of_PART_OF_A_TOTAL,NumUsrs) < 0)
 	 Err_NotEnoughMemoryExit ();
-      HTM_BUTTON_SUBMIT_Begin (Title,The_ClassFormLinkOutBox[Gbl.Prefs.Theme],NULL);
+      HTM_BUTTON_OnSubmit_Begin (Title,The_ClassFormLinkOutBox[Gbl.Prefs.Theme],NULL);
       free (Title);
 	 HTM_TxtF ("#%u",Rank);
       HTM_BUTTON_End ();
@@ -1328,15 +1328,15 @@ static void Prf_ShowUsrInRanking (struct UsrData *UsrDat,unsigned Rank,bool ItsM
    HTM_TD_End ();
 
    /***** Put form to go to public profile *****/
-   HTM_TD_Begin ("class=\"%s\"",Gbl.ColorRows[Gbl.RowEvenOdd]);
+   HTM_TD_Begin ("class=\"RANK_USR %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]);
       if (Visible)
 	{
 	 Frm_BeginForm (ActSeeOthPubPrf);
 	    Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
-	    HTM_BUTTON_SUBMIT_Begin (Txt_Another_user_s_profile,
-				     ItsMe ? "BT_LINK RANK_USR DAT_SMALL_N" :
-					     "BT_LINK RANK_USR DAT_SMALL",
-				     NULL);	// Limited width
+	    HTM_BUTTON_OnSubmit_Begin (Txt_Another_user_s_profile,
+				       ItsMe ? "BT_LINK DAT_SMALL_N" :
+					       "BT_LINK DAT_SMALL",
+				       NULL);	// Limited width
 	       Usr_WriteFirstNameBRSurnames (UsrDat);
 	    HTM_BUTTON_End ();
 	 Frm_EndForm ();
diff --git a/swad_project.c b/swad_project.c
index f884e624..b275a82a 100644
--- a/swad_project.c
+++ b/swad_project.c
@@ -991,7 +991,7 @@ static void Prj_ShowProjectsHead (struct Prj_Projects *Projects,
 	   Order <= (Prj_Order_t) (Prj_NUM_ORDERS - 1);
 	   Order++)
 	{
-	 HTM_TH_Begin (1,1,"LM");
+	 HTM_TH_Begin (1,1,"TIT_TBL LM");
 
 	    switch (ProjectView)
 	      {
@@ -1002,7 +1002,8 @@ static void Prj_ShowProjectsHead (struct Prj_Projects *Projects,
 				    Order,
 				    Projects->CurrentPage,
 				    -1L);
-		     HTM_BUTTON_SUBMIT_Begin (Txt_PROJECT_ORDER_HELP[Order],"BT_LINK TIT_TBL",NULL);
+		     HTM_BUTTON_OnSubmit_Begin (Txt_PROJECT_ORDER_HELP[Order],
+		                                "BT_LINK",NULL);
 			if (Order == Projects->SelectedOrder)
 			   HTM_U_Begin ();
 			HTM_Txt (Txt_PROJECT_ORDER[Order]);
@@ -1257,7 +1258,6 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects,
    const char *ClassLabel;
    const char *ClassDate;
    const char *ClassTitle;
-   const char *ClassLink;
    const char *ClassData;
    struct Prj_Faults Faults;
    bool PrjIsFaulty;
@@ -1271,8 +1271,6 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects,
 					      "DATE_BLUE";
    ClassTitle = (Prj->Hidden == Prj_HIDDEN) ? "ASG_TITLE_LIGHT" :
 					      "ASG_TITLE";
-   ClassLink  = (Prj->Hidden == Prj_HIDDEN) ? "BT_LINK LT ASG_TITLE_LIGHT" :
-					      "BT_LINK LT ASG_TITLE";
    ClassData  = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] :
 					      The_ClassDat[Gbl.Prefs.Theme];
 
@@ -1382,7 +1380,7 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects,
 		 {
 		  Frm_BeginForm (ActAdmDocPrj);
 		     Prj_PutCurrentParams (Projects);
-		     HTM_BUTTON_SUBMIT_Begin (Txt_Project_files,ClassLink,NULL);
+		     HTM_BUTTON_OnSubmit_Begin (Txt_Project_files,"BT_LINK",NULL);
 			HTM_Txt (Prj->Title);
 		     HTM_BUTTON_End ();
 		  Frm_EndForm ();
diff --git a/swad_question.c b/swad_question.c
index 715f98c5..2fca6de3 100644
--- a/swad_question.c
+++ b/swad_question.c
@@ -926,14 +926,15 @@ void Qst_WriteHeadingRowQuestionsForEdition (struct Qst_Questions *Questions)
 	   Order <= (Qst_QuestionsOrder_t) (Qst_NUM_TYPES_ORDER_QST - 1);
 	   Order++)
 	{
-	 HTM_TH_Begin (1,1,"LT");
+	 HTM_TH_Begin (1,1,"TIT_TBL LT");
 
 	    if (Questions->NumQsts > 1)
 	      {
 	       Frm_BeginForm (ActLstTstQst);
 		  Qst_PutParamsEditQst (Questions);
 		  Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-		  HTM_BUTTON_SUBMIT_Begin (Txt_TST_STR_ORDER_FULL[Order],"BT_LINK TIT_TBL",NULL);
+		  HTM_BUTTON_OnSubmit_Begin (Txt_TST_STR_ORDER_FULL[Order],
+		                             "BT_LINK",NULL);
 		     if (Order == Questions->SelectedOrder)
 			HTM_U_Begin ();
 	      }
diff --git a/swad_record.c b/swad_record.c
index 7d5af7f7..d54a722a 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -1396,7 +1396,7 @@ static void Rec_ShowLinkToPrintPreviewOfRecords (void)
    extern const char *Txt_record_cards_per_page;
    unsigned i;
 
-   HTM_BUTTON_SUBMIT_Begin (Txt_Print,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],NULL);
+   HTM_BUTTON_OnSubmit_Begin (Txt_Print,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],NULL);
       Ico_PutIconTextLink ("print.svg",Ico_BLACK,Txt_Print);
    HTM_BUTTON_End ();
 
@@ -2563,7 +2563,7 @@ static void Rec_ShowInstitutionInHead (struct Ins_Instit *Ins,bool PutFormLinks)
 	   {
 	    Frm_BeginFormGoTo (ActSeeInsInf);
 	       Ins_PutParamInsCod (Ins->InsCod);
-	       HTM_BUTTON_SUBMIT_Begin (Ins->FullName,"BT_LINK",NULL);
+	       HTM_BUTTON_OnSubmit_Begin (Ins->FullName,"BT_LINK",NULL);
 	   }
 	 Lgo_DrawLogo (HieLvl_INS,Ins->InsCod,Ins->ShrtName,
 		       Rec_INSTITUTION_LOGO_SIZE,NULL,true);
@@ -2584,7 +2584,7 @@ static void Rec_ShowInstitutionInHead (struct Ins_Instit *Ins,bool PutFormLinks)
 	   {
 	    Frm_BeginFormGoTo (ActSeeInsInf);
 	       Ins_PutParamInsCod (Ins->InsCod);
-	       HTM_BUTTON_SUBMIT_Begin (Ins->FullName,"BT_LINK REC_HEAD LM",NULL);
+	       HTM_BUTTON_OnSubmit_Begin (Ins->FullName,"BT_LINK",NULL);
 	   }
 	 HTM_Txt (Ins->FullName);
 	 if (PutFormLinks)
@@ -2662,10 +2662,9 @@ static void Rec_ShowNickname (struct UsrData *UsrDat,bool PutFormLinks)
 	       ItsMe = Usr_ItsMe (UsrDat->UsrCod);
 	       Frm_BeginForm (ActSeeOthPubPrf);
 		  Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
-		  HTM_BUTTON_SUBMIT_Begin (ItsMe ? Txt_My_public_profile :
-						   Txt_Another_user_s_profile,
-					   "BT_LINK REC_NICK",
-					   NULL);
+		  HTM_BUTTON_OnSubmit_Begin (ItsMe ? Txt_My_public_profile :
+						     Txt_Another_user_s_profile,
+					     "BT_LINK",NULL);
 	      }
 	    HTM_TxtF ("@%s",UsrDat->Nickname);
 	    if (PutFormLinks)
@@ -2686,15 +2685,11 @@ static void Rec_ShowCountryInHead (struct UsrData *UsrDat,bool ShowData)
   {
    extern const char *The_ClassDatStrong[The_NUM_THEMES];
 
-   HTM_TD_Begin ("class=\"REC_C2_MID LT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
+   HTM_TD_Begin ("class=\"REC_C2_MID LT %s\"",
+                 The_ClassDatStrong[Gbl.Prefs.Theme]);
       if (ShowData && UsrDat->CtyCod > 0)
-	{
 	 /* Link to see country information */
-	 Cty_WriteCountryName (UsrDat->CtyCod,
-			       Str_BuildString ("BT_LINK %s",
-			                        The_ClassDatStrong[Gbl.Prefs.Theme]));	// Put link to country
-	 Str_FreeStrings ();
-	}
+	 Cty_WriteCountryName (UsrDat->CtyCod,"BT_LINK");	// Put link to country
    HTM_TD_End ();
   }
 
diff --git a/swad_room.c b/swad_room.c
index 8881c10d..3878ba42 100644
--- a/swad_room.c
+++ b/swad_room.c
@@ -183,10 +183,11 @@ void Roo_SeeRooms (void)
 	      Order <= (Roo_Order_t) (Roo_NUM_ORDERS - 1);
 	      Order++)
 	   {
-	    HTM_TH_Begin (1,1,"LM");
+	    HTM_TH_Begin (1,1,"TIT_TBL LM");
 	       Frm_BeginForm (ActSeeRoo);
 		  Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
-		  HTM_BUTTON_SUBMIT_Begin (Txt_ROOMS_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
+		  HTM_BUTTON_OnSubmit_Begin (Txt_ROOMS_HELP_ORDER[Order],
+		                             "BT_LINK",NULL);
 		     if (Order == Rooms.SelectedOrder)
 			HTM_U_Begin ();
 		     HTM_Txt (Txt_ROOMS_ORDER[Order]);
diff --git a/swad_statistic.c b/swad_statistic.c
index b4258d5a..9d728161 100644
--- a/swad_statistic.c
+++ b/swad_statistic.c
@@ -1141,12 +1141,12 @@ static void Sta_ShowDetailedAccessesList (const struct Sta_Stats *Stats,
 		     Par_PutHiddenParamUnsigned (NULL,"RowsPage",Stats->RowsPerPage);
 		     Usr_PutHiddenParSelectedUsrsCods (&Gbl.Usrs.Selected);
 		 }
-	       HTM_TD_Begin ("class=\"LM\"");
+	       HTM_TD_Begin ("class=\"TIT_TBL LM\"");
 		  if (FirstRow > 1)
 		    {
-		     HTM_BUTTON_SUBMIT_Begin (Str_BuildString (Txt_Show_previous_X_clicks,
-		                                               Stats->RowsPerPage),
-					      "BT_LINK TIT_TBL",NULL);
+		     HTM_BUTTON_OnSubmit_Begin (Str_BuildString (Txt_Show_previous_X_clicks,
+		                                                 Stats->RowsPerPage),
+					        "BT_LINK",NULL);
 		     Str_FreeStrings ();
 			HTM_STRONG_Begin ();
 			   HTM_TxtF ("&lt;%s",Txt_PAGES_Previous);
@@ -1179,12 +1179,12 @@ static void Sta_ShowDetailedAccessesList (const struct Sta_Stats *Stats,
 		     Par_PutHiddenParamUnsigned (NULL,"RowsPage" ,(unsigned) Stats->RowsPerPage);
 		     Usr_PutHiddenParSelectedUsrsCods (&Gbl.Usrs.Selected);
 		 }
-	       HTM_TD_Begin ("class=\"RM\"");
+	       HTM_TD_Begin ("class=\"TIT_TBL RM\"");
 		  if (LastRow < NumHits)
 		    {
-		     HTM_BUTTON_SUBMIT_Begin (Str_BuildString (Txt_Show_next_X_clicks,
-		                                               Stats->RowsPerPage),
-					      "BT_LINK TIT_TBL",NULL);
+		     HTM_BUTTON_OnSubmit_Begin (Str_BuildString (Txt_Show_next_X_clicks,
+		                                                 Stats->RowsPerPage),
+					        "BT_LINK",NULL);
 		     Str_FreeStrings ();
 			HTM_STRONG_Begin ();
 			   HTM_TxtF ("%s&gt;",Txt_PAGES_Next);
@@ -2937,7 +2937,7 @@ static void Sta_WriteCountry (long CtyCod)
 	 Cty_DrawCountryMapAndNameWithLink (&Cty,ActSeeCtyInf,
 					    "COUNTRY_TINY",
 					    "COUNTRY_MAP_TINY",
-					    "BT_LINK LT LOG");
+					    "BT_LINK");
 	}
       else			// Hit with no country selected
 	 /***** No country selected *****/
@@ -3025,7 +3025,7 @@ static void Sta_WriteInstit (long InsCod)
 
 	 /***** Form to go to institution *****/
 	 Ins_DrawInstitutionLogoAndNameWithLink (&Ins,ActSeeInsInf,
-						 "BT_LINK LT LOG","CT");
+						 "BT_LINK","CT");
      }
    else			// Hit with no institution selected
      {
@@ -3116,7 +3116,7 @@ static void Sta_WriteCenter (long CtrCod)
 
 	 /***** Form to go to center *****/
 	 Ctr_DrawCenterLogoAndNameWithLink (&Ctr,ActSeeCtrInf,
-					    "BT_LINK LT LOG","CT");
+					    "BT_LINK","CT");
      }
    else			// Hit with no center selected
      {
@@ -3207,7 +3207,7 @@ static void Sta_WriteDegree (long DegCod)
 
 	 /***** Form to go to degree *****/
 	 Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeDegInf,
-					    "BT_LINK LT LOG","CT");
+					    "BT_LINK","CT");
      }
    else			// Hit with no degree selected
      {
@@ -3295,7 +3295,8 @@ static void Sta_ShowNumHitsPerCourse (Sta_CountType_t CountType,
 	      {
 	       Frm_BeginFormGoTo (ActSeeCrsInf);
 		  Crs_PutParamCrsCod (Crs.CrsCod);
-		  HTM_BUTTON_SUBMIT_Begin (Str_BuildGoToMsg (Crs.FullName),"BT_LINK LT LOG",NULL);
+		  HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Crs.FullName),
+		                             "BT_LINK",NULL);
 		  Str_FreeStrings ();
 		     HTM_Txt (Crs.ShrtName);
 		  HTM_BUTTON_End ();
diff --git a/swad_survey.c b/swad_survey.c
index 9e752bbf..40cdb0ae 100644
--- a/swad_survey.c
+++ b/swad_survey.c
@@ -249,7 +249,7 @@ static void Svy_ListAllSurveys (struct Svy_Surveys *Surveys)
 		    Order <= Dat_END_TIME;
 		    Order++)
 		 {
-		  HTM_TH_Begin (1,1,"LM");
+		  HTM_TH_Begin (1,1,"TIT_TBL LM");
 
 		     /* Form to change order */
 		     Frm_BeginForm (ActSeeAllSvy);
@@ -257,8 +257,8 @@ static void Svy_ListAllSurveys (struct Svy_Surveys *Surveys)
 			Grp_PutParamWhichGroups (&WhichGroups);
 			Pag_PutHiddenParamPagNum (Pag_SURVEYS,Surveys->CurrentPage);
 			Dat_PutHiddenParamOrder (Order);
-			HTM_BUTTON_SUBMIT_Begin (Txt_START_END_TIME_HELP[Order],
-						 "BT_LINK TIT_TBL",NULL);
+			HTM_BUTTON_OnSubmit_Begin (Txt_START_END_TIME_HELP[Order],
+						   "BT_LINK",NULL);
 			   if (Order == Surveys->SelectedOrder)
 			      HTM_U_Begin ();
 			   HTM_Txt (Txt_START_END_TIME[Order]);
@@ -537,10 +537,10 @@ static void Svy_ShowOneSurvey (struct Svy_Surveys *Surveys,
 	    WhichGroups = Grp_GetParamWhichGroups ();
 	    Grp_PutParamWhichGroups (&WhichGroups);
 	    Pag_PutHiddenParamPagNum (Pag_SURVEYS,Surveys->CurrentPage);
-	    HTM_BUTTON_SUBMIT_Begin (Txt_View_survey,
-				     Svy.Status.Visible ? "BT_LINK LT ASG_TITLE" :
-							  "BT_LINK LT ASG_TITLE_LIGHT",
-				     NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Txt_View_survey,
+				       Svy.Status.Visible ? "BT_LINK ASG_TITLE" :
+							    "BT_LINK ASG_TITLE_LIGHT",
+				       NULL);
 	       HTM_Txt (Svy.Title);
 	    HTM_BUTTON_End ();
 	 Frm_EndForm ();
diff --git a/swad_system_config.c b/swad_system_config.c
index a3fe2240..b0304c3d 100644
--- a/swad_system_config.c
+++ b/swad_system_config.c
@@ -309,13 +309,9 @@ static void SysCfg_NumCtys (void)
       Frm_LabelColumn ("RT",NULL,Txt_Countries);
 
       /* Data */
-      HTM_TD_Begin ("class=\"LB\"");
+      HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
 	 Frm_BeginFormGoTo (ActSeeCty);
-	    HTM_BUTTON_SUBMIT_Begin (Txt_Countries,
-	                             Str_BuildString ("BT_LINK %s",
-	                                              The_ClassDat[Gbl.Prefs.Theme]),
-	                             NULL);
-	    Str_FreeStrings ();
+	    HTM_BUTTON_OnSubmit_Begin (Txt_Countries,"BT_LINK",NULL);
 	       HTM_Unsigned (Cty_GetCachedNumCtysInSys ());
 	    HTM_BUTTON_End ();
 	 Frm_EndForm ();
diff --git a/swad_tab.c b/swad_tab.c
index af58062b..610f9f67 100644
--- a/swad_tab.c
+++ b/swad_tab.c
@@ -123,10 +123,8 @@ void Tab_DrawTabs (void)
 
 		  Frm_BeginForm (ActMnu);
 		     Par_PutHiddenParamUnsigned (NULL,"NxtTab",(unsigned) NumTab);
-		     HTM_BUTTON_SUBMIT_Begin (Txt_TABS_TXT[NumTab],
-					      NumTab == Gbl.Action.Tab ? "BT_LINK" :
-									 "BT_LINK",
-					      NULL);
+		     HTM_BUTTON_OnSubmit_Begin (Txt_TABS_TXT[NumTab],
+		                                "BT_LINK",NULL);
 			HTM_IMG (Gbl.Prefs.URLIconSet,Tab_GetIcon (NumTab),Txt_TABS_TXT[NumTab],
 				 "class=\"TAB_ICO%s\"",ClassIcoTab[Gbl.Prefs.IconSet][Gbl.Prefs.Theme]);
 			HTM_DIV_Begin ("class=\"TAB_TXT %s\"",
diff --git a/swad_theme.c b/swad_theme.c
index f40ae504..531b082e 100644
--- a/swad_theme.c
+++ b/swad_theme.c
@@ -455,6 +455,17 @@ const char *The_ClassPhoto[The_NUM_THEMES] =
    [The_THEME_DARK  ] = "CLASSPHOTO_DARK",
   };
 
+const char *The_ClassNoticeTextColor[The_NUM_THEMES] =
+  {
+   [The_THEME_WHITE ] = "NOTICE_TEXT_WHITE",
+   [The_THEME_GREY  ] = "NOTICE_TEXT_GREY",
+   [The_THEME_PURPLE] = "NOTICE_TEXT_PURPLE",
+   [The_THEME_BLUE  ] = "NOTICE_TEXT_BLUE",
+   [The_THEME_YELLOW] = "NOTICE_TEXT_YELLOW",
+   [The_THEME_PINK  ] = "NOTICE_TEXT_PINK",
+   [The_THEME_DARK  ] = "NOTICE_TEXT_DARK",
+  };
+
 /*****************************************************************************/
 /****************************** Private prototypes ***************************/
 /*****************************************************************************/
diff --git a/swad_timeline_comment.c b/swad_timeline_comment.c
index b7039560..64a1cdab 100644
--- a/swad_timeline_comment.c
+++ b/swad_timeline_comment.c
@@ -513,7 +513,7 @@ static void Tml_Com_PutIconToToggleComms (const char *UniqueId,
       Err_NotEnoughMemoryExit ();
 
    /***** Link to toggle on/off some divs *****/
-   HTM_BUTTON_BUTTON_Begin (Text,The_ClassFormLinkInBox[Gbl.Prefs.Theme],OnClick);
+   HTM_BUTTON_OnClick_Begin (Text,The_ClassFormLinkInBox[Gbl.Prefs.Theme],OnClick);
       Ico_PutIconTextLink (Icon,Ico_BLACK,Text);
    HTM_BUTTON_End ();
 
@@ -626,11 +626,12 @@ static void Tml_Com_WriteAuthorName (const struct UsrData *UsrDat)	// Author
       Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
 
       /* Author's name */
-      HTM_BUTTON_SUBMIT_Begin (Usr_ItsMe (UsrDat->UsrCod) ? Txt_My_public_profile :
-							    Txt_Another_user_s_profile,
-			       Str_BuildString ("Tml_COM_AUTHOR Tml_COMM_AUTHOR_WIDTH BT_LINK %s BOLD",
-			                        The_ClassDat[Gbl.Prefs.Theme]),
-			       NULL);
+      HTM_BUTTON_OnSubmit_Begin (Usr_ItsMe (UsrDat->UsrCod) ? Txt_My_public_profile :
+							      Txt_Another_user_s_profile,
+			         Str_BuildString ("Tml_COM_AUTHOR Tml_COMM_AUTHOR_WIDTH BT_LINK %s BOLD",
+			                          The_ClassDat[Gbl.Prefs.Theme]),
+			         NULL);
+      Str_FreeStrings ();
 	 HTM_Txt (UsrDat->FullName);
       HTM_BUTTON_End ();
 
diff --git a/swad_timeline_form.c b/swad_timeline_form.c
index f434cca0..65b0328c 100644
--- a/swad_timeline_form.c
+++ b/swad_timeline_form.c
@@ -344,7 +344,7 @@ void Tml_Frm_FormToShowHiddenComms (long NotCod,
 	 free (OnSubmit);
 
 	    /* Put icon and text with link to show the first hidden comments */
-	    HTM_BUTTON_SUBMIT_Begin (NULL,The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL);
+	    HTM_BUTTON_OnSubmit_Begin (NULL,The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL);
 	       Ico_PutIconTextLink ("angle-up.svg",Ico_BLACK,
 				    Str_BuildString (Txt_See_the_previous_X_COMMENTS,
 				                     NumInitialComms));
diff --git a/swad_timeline_note.c b/swad_timeline_note.c
index 1e2b6605..fbdd4e85 100644
--- a/swad_timeline_note.c
+++ b/swad_timeline_note.c
@@ -353,7 +353,7 @@ void Tml_Not_WriteAuthorName (const struct UsrData *UsrDat,
       Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
 
       /* Author's name */
-      HTM_BUTTON_SUBMIT_Begin (Usr_ItsMe (UsrDat->UsrCod) ? Txt_My_public_profile :
+      HTM_BUTTON_OnSubmit_Begin (Usr_ItsMe (UsrDat->UsrCod) ? Txt_My_public_profile :
 							    Txt_Another_user_s_profile,
 			       Class,NULL);
 	 HTM_Txt (UsrDat->FullName);
@@ -686,10 +686,10 @@ static void Tml_Not_PutFormGoToAction (const struct Tml_Not_Note *Not,
 
 	    /***** Icon and link to go to action *****/
 	    /* Begin button */
-	    HTM_BUTTON_SUBMIT_Begin (Txt_TIMELINE_NOTE[Not->Type],
-				     Str_BuildString ("BT_LINK %s ICO_HIGHLIGHT",
-						      The_ClassFormInBoxBold[Gbl.Prefs.Theme]),
-				     NULL);
+	    HTM_BUTTON_OnSubmit_Begin (Txt_TIMELINE_NOTE[Not->Type],
+				       Str_BuildString ("BT_LINK %s ICO_HIGHLIGHT",
+						        The_ClassFormInBoxBold[Gbl.Prefs.Theme]),
+				       NULL);
 	    Str_FreeStrings ();
 
 	       /* Icon and text */
diff --git a/swad_timeline_post.c b/swad_timeline_post.c
index 5a5a759e..117661d1 100644
--- a/swad_timeline_post.c
+++ b/swad_timeline_post.c
@@ -233,7 +233,7 @@ void Tml_Pst_PutTextarea (const char *Placeholder,const char *ClassTextArea)
       Str_FreeStrings ();
 
       /***** Submit button *****/
-      HTM_BUTTON_SUBMIT_Begin (NULL,"BT_SUBMIT_INLINE BT_CREATE",NULL);
+      HTM_BUTTON_OnSubmit_Begin (NULL,"BT_SUBMIT_INLINE BT_CREATE",NULL);
 	 HTM_Txt (Txt_Post);
       HTM_BUTTON_End ();
 
diff --git a/swad_user.c b/swad_user.c
index 9c433234..f609d40b 100644
--- a/swad_user.c
+++ b/swad_user.c
@@ -1362,11 +1362,7 @@ void Usr_WriteLoggedUsrHead (void)
       if (NumAvailableRoles == 1)
 	{
 	 Frm_BeginForm (ActFrmRolSes);
-	    HTM_BUTTON_SUBMIT_Begin (Txt_Role,
-				     Str_BuildString ("BT_LINK %s",
-						      The_ClassUsr[Gbl.Prefs.Theme]),
-				     NULL);
-	    Str_FreeStrings ();
+	    HTM_BUTTON_OnSubmit_Begin (Txt_Role,"BT_LINK",NULL);
 	       HTM_Txt (Txt_ROLES_SINGUL_Abc[Gbl.Usrs.Me.Role.Logged][Gbl.Usrs.Me.UsrDat.Sex]);
 	    HTM_BUTTON_End ();
 	 Frm_EndForm ();
@@ -3650,7 +3646,7 @@ static void Set_FormToSelectUsrListType (void (*FuncParams) (void *Args),void *A
 	 FuncParams (Args);
 
       /***** Link and image *****/
-      HTM_BUTTON_SUBMIT_Begin (Txt_USR_LIST_TYPES[ListType],
+      HTM_BUTTON_OnSubmit_Begin (Txt_USR_LIST_TYPES[ListType],
 			       The_ClassFormLinkInBoxNoWrap[Gbl.Prefs.Theme],
 			       Gbl.Action.Act == ActReqMsgUsr ? "CopyMessageToHiddenFields();" :
 								NULL);
@@ -6437,13 +6433,13 @@ void Usr_ShowTableCellWithUsrData (struct UsrData *UsrDat,unsigned NumRows)
    /* Action to go to user's record depending on role in course */
    if (!NextAction[UsrDat->Roles.InCurrentCrs])
       /* Begin div */
-      HTM_DIV_Begin ("class=\"LT AUTHOR_TXT\"");
+      HTM_DIV_Begin ("class=\"AUTHOR_TXT\"");
    else
      {
       /* Begin form to go to user's record card */
       Frm_BeginForm (NextAction[UsrDat->Roles.InCurrentCrs]);
 	 Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
-	 HTM_BUTTON_SUBMIT_Begin (UsrDat->FullName,"BT_LINK LT AUTHOR_TXT",NULL);
+	 HTM_BUTTON_OnSubmit_Begin (UsrDat->FullName,"BT_LINK AUTHOR_TXT",NULL);
      }
 
    /* User's ID */