diff --git a/web/gpg4win.css b/web/gpg4win.css
index b2526158..b0e47f92 100644
--- a/web/gpg4win.css
+++ b/web/gpg4win.css
@@ -1,1031 +1,1035 @@
 /* Styles for the Gpg4win Website */
 
 body {
  font-family: arial, helvetica, sans-serif;
  font-size: 13px;
  background: #FFFFFF url('img/page_bg.png') repeat-x;
  color: #333333;
  margin: 0px;
  padding:0px;
 }
 
 a {
  color: #b51a22;
  text-decoration: none;
 }
 
 a:hover {
  text-decoration: underline;
 }
 
 img {
  border: 0px;
 }
 
 .imageframe {
  border-color: #DEDEDE #AAAAAA #888888 #CECECE;
  border-style: double;
  border-width: 1px;
  padding: 5px;
 }
 
 .imgfloatleft {
  float: left;
  margin: 0px 20px 30px 0px;
 }
 
 td {
  vertical-align: top;
 }
 
 .odd td {
  background: #E6E6E6;
 }
 
 .wrapper {
  width: 900px;
  margin: 0 auto;
  text-align: left;
 }
 
 .language_select {
  float:right;
  height: 100%;
 }
 
 .logo {
  margin-top: 20px;
  margin-left: 15px;
 }
 
 .header {
  padding: 6px 0 6px 0;
  margin-bottom: 0px;
  height: 1em;
 }
 
 .fancy_intro {
  background: url('img/fancy_bg.png') no-repeat;
  background-position: 276px 0px;
  height:250px;
  margin: 0 20px 25px 14px;
  border-bottom:1px solid gray;
  overflow: hidden;
  width:870px;
  padding-bottom: 15px;
 }
 
 .mini_intro {
  clear: both;
  font-size: 12px;
  line-height: 38px;
  margin-top: 8px;
 }
 
 #download_button {
  position: relative;
  top: 45px;
  width: 250px;
  z-index: 0;
 }
 
 #download_button a {
  background: url('img/download_button.png');
  background-repeat: no-repeat;
  display: block;
  height: 116px;
  width: 260px;
  color: #FFFFFF;
  font-weight: bold;
  text-decoration: none;
  font-size: 19px;
 }
 
 #download_button a:hover {
  background-position: 0px -116px;
 }
 
 #download_button .text {
  position: relative;
  top: 23px;
  left: 25px;
 }
 
 #breadcrum {
  float:left;
 }
 
 #download_button_mini {
  position: relative;
  top: 45px;
  left: 35px;
  width: 250px;
  z-index: 0;
 }
 
 #download_button_mini .links {
  position: relative;
  font-size: 10px;
  text-align: right;
 }
 
 #download_button_mini .dmini_button {
  background: url('img/download_button_mini.png');
  background-repeat: no-repeat;
  display: block;
  height: 50px;
  width: 189px;
  text-align:left;
  left: 20px;
  font-size: 14px;
  line-height:50px;
  color: #FFFFFF;
  font-weight:bold;
  text-decoration:none;
 }
 
 #download_button_mini .dmini_button:hover {
  background-position: 0px -50px;
 }
 
 #download_button_mini .text {
  position: relative;
  left: 12px;
 }
 
 .download_button_links {
  font-size:11px;
  position: relative;
  left: 25px;
  top: 43px;
  width: 250px;
 }
 
 .donate_box {
   border-radius: 4px;
   background: #FDF1CD;
   border: 1px solid #CCCCCC;
   padding: 20px 20px 15px;
   min-height: 365px;
 }
 .donate_box h3 {
   margin: 0;
 }
 .donate_box #download_div {
   margin-top: 15px;
 }
 
 #currencyfield {
     font-size: 14px;
     height: 30px;
 }
 .donateButton {
     background: url('img/download-arrow.png') no-repeat 9px 9px;
     background-size: 20px 20px;
     padding-left: 36px;
     padding-right: 10px;
     font-size: 14px;
     height: 40px;
     border: 2px white;
     border-radius: 4px;
     text-align: center;
     font-weight: bold;
     text-decoration: none;
 }
 a>.donateButton{
   margin-top: 40px;
 }
 
 
 .donate_box blockquote {
     line-height: 150%;
 }
 .donate_box .pay-logo {
     width: 100px;
 }
 
 .donate_box .qrcode {
     width: 130px;
 }
 
 /* donation slider */
 input[type='range'] {
     -webkit-appearance: none;
     appearance: none;
     -moz-appearance: none;
     border-radius: 5px;
     box-shadow: inset 1px 1px 1px rgba(000,000,000,0.25);
     background-color: #FFF;
     height: 8px;
     vertical-align: middle;
     width: 200px;
     cursor: pointer;
     margin: 10px 0;
 }
 input[type=range]::-webkit-slider-runnable-track {
     -webkit-appearance: none;
     appearance: none;
     border-radius: 5px;
     box-shadow: inset 1px 1px 1px rgba(000,000,000,0.25);
     background-color: #FFF;
     height: 10px;
     vertical-align: middle;
     border: solid 1px rgba(0,0,0,0.25);
     cursor: pointer;
 }
 input[type='range']::-webkit-slider-thumb {
     -webkit-appearance: none;
     border-radius: 10px;
     background-color: #FFC35C;
     box-shadow: inset 0px 1px 0px rgba(000,000,000,0.5);
     border: 1px solid #999;
     height: 20px;
     width: 20px;
     border-radius: 15px;
     vertical-align:middle;
     margin-top: -6px;
     cursor: pointer;
 }
 input[type='range']::-moz-range-track {
     -moz-appearance: none;
     border-radius: 5px;
     box-shadow: inset 1px 1px 1px rgba(000,000,000,0.25);
     background-color: #FFF;
     height: 8px;
     border:solid 1px rgba(0,0,0,0.25);
     vertical-align: middle;
     margin: 0;
     padding: 0;
     cursor: pointer;
 }
 input[type='range']::-moz-range-thumb {
     -moz-appearance: none;
     border-radius: 10px;
     background-color: #FFC35C;
     box-shadow:inset 0px 1px 0px rgba(000,000,000,0.5);
     border: 1px solid #999;
     height: 20px;
     width: 20px;
     border-radius: 15px;
     cursor: pointer;
 }
 
 /* With beta this needs other offsets. Maybe someone with
  * more CSS skills could make this more relative / robust. ;-) */
 .h_text_beta {
  position: relative;
  top: -190px;
  left: 669px;
  width: 180px;
  font-size: 11px;
  border-left: 1px solid #CCCCCC;
  padding-left: 10px;
  margin-top: 12px;
  height: 220px;
 }
 
 .h_text_beta .heading {
  font-size: 23px;
  font-family: georgia, times, serif;
  padding-bottom: 9px;
 }
 
 .h_text_beta .serif_word {
  font-size: 13px;
  font-weight: bold;
 }
 
 .h_text_beta .limiter {
  border-bottom: 3px dotted #CCCCCC;
  width: 190px;
  height: 10px;
  margin-bottom: 3px;
 }
 
 .h_text {
  position: relative;
  top: -125px;
  left: 656px;
  width: 202px;
  font-size: 11px;
  border-left: 1px solid #CCCCCC;
  padding-left: 10px;
  margin-top: 12px;
  height: 220px;
 }
 
 .h_text .heading {
  font-size: 23px;
  font-family: georgia, times, serif;
  padding-bottom: 9px;
 }
 
 .h_text .serif_word {
  font-size: 13px;
  font-weight: bold;
 }
 
 .h_text .limiter {
  border-bottom: 3px dotted #CCCCCC;
  width: 190px;
  height: 10px;
  margin-bottom: 3px;
 }
 .center {
  text-align: center;
 }
 
 .content {
  width: 100%;
 }
 
 #intro {
  padding: 0px 250px 20px 20px;
 }
 
 /*#intro span {
  background: url('img/logo.png') no-repeat scroll 50px 0px transparent;
  height: 56px;
  margin: 0px;
  width: 250px;
  float: right;
  margin: 0px;
  line-height: 24px;
  margin: 10px 200px 0 0;
 }*/
 
 #intro h2 {
  font-family: georgia, times, serif;
  font-size: 30px;
  font-weight: normal;
  color: #333333;
  margin: 0px;
 }
 
 #intro p {
  color: #555555;
  font-size: 14px;
  font-weight: normal;
  line-height: 26px;
  margin: 10px 0 0;
  padding: 0;
 }
 
 .column1, .column2, .column3 {
  display: inline;
  float: left;
  margin-right: 25px;
  position: relative;
  width: 270px;
 }
 
 .column3 {
  margin-right: 0px;
 }
 
 .column1 img, .column2 img, .column3 img {
  width: 270px;
 }
 
 
 #main {
  float: left;
  padding: 0px 0px 0px 20px;
  width: 600px;
 }
 
 #full {
  float: left;
  padding: 0px 20px 0px 20px;
  width: 860px;
 }
 
 #main h2, #full h2 {
  font-size: 22px;
  font-weight: normal;
  color: #333333;
  margin: 30px 0px 10px 0px;
  padding: 0px;
  clear: both;
 }
 
 #main h4, #full h4 {
  font-size: 18px;
  color: #333333;
  font-family: georgia, serif;
  font-style: italic;
  font-weight: normal;
 }
 
 #main p, #full p, #main li, #full li{
  color: #444444;
  line-height: 20px;
  margin: 0px 0px 10px;
 }
 .lineheight {
  line-height: 20px;
 }
 .cleanlist li {
  font-size: 13px;
  list-style: none;
  padding: 0px;
  clear: both;
 }
 
 .screenshots img {
  width: 250px;
 }
 
 #sidebar {
  -moz-border-radius: 10px 10px 10px 10px;
  background: #FDF1CD;
  border: 1px solid #CCCCCC;
  float: right;
  margin-top: 34px;
  padding: 20px 20px 15px;
  width: 220px;
 }
 
 #sidebar h3 {
  color: #333333;
  margin: 1px 0px 10px 0px;
 }
 
 #sidebarsimple {
  float: right;
  margin-top: 34px;
 }
 
 .newslist {
  margin: 0px;
  padding: 0px;
 }
 
 .newslist li {
  font-size: 13px;
  list-style: none;
  padding: 0;
  border-bottom: 1px solid #EFEFEF;
 }
 
 .newslist > li > a {
  /*color: #555555;*/
  display: block;
  font-size: 12px;
  font-weight: bold;
  list-style: none;
  margin: 0px;
  padding: 10px 0px 10px 0px;
  text-decoration: none;
 }
 
 .newslist li p {
  color: #777777;
  font-size: 10px;
  font-weight: normal;
  margin: 4px 0px 0px;
  padding: 0px;
 }
 
 #menu {
  height:45px;
  z-index: 1;
 }
 
 #menu .active a {
  background-position: 0px -180px;
 }
 
 #menu ul {
  list-style: none;
  padding: 0px;
  margin: 0px;
 }
 
 #menu li {
  float: left;
  margin-right: 0px;
  margin-left:0px;
  padding: 0px;
  text-align: center;
 }
 
 #menu .mlogo {
  border:0px;
 }
 
 #menu .mlogo a {
  display:block;
- width: 307px;
+ /* With what's new shield */
+ width: 161;
+ /* Without shield
+  width: 307px
+ */
  height: 58px;
  position: relative;
  top: -13px;
  background: url('img/inmenulogo.png');
- /* activate next line for version without shield shadow */
  background-position: 0px -116px;
 }
 
 #menu .mlogo a:hover {
  background: url('img/inmenulogo.png');
- /* background-position: 0px -58px; */
- /* activate next line for version without shield shadow */
- background-position: 0px -174px;
+ /* With what's new shield */
+ background-position: 0px -58px;
+ /* Without shield
+ background-position: 0px -174px */;
 }
 
 #menu .mwhatsnew  {
  border:0px;
  line-height: 2em;
 }
 
 #menu .mwhatsnew a {
  display:block;
  width: 110px;
  height: 77px;
  position: relative;
  top: -9px;
  background: url('img/whatsnew.png');
  line-height: 34px;
 }
 
 #menu .mwhatsnew a:hover {
  background: url('img/whatsnew.png');
  background-position: 0px -77px;
 }
 
 #menu .mwhatsnew div {
  font-size: 120%;
  padding-top: 10px;
  line-height: 24px;
 }
 
 #menu .mbetween {
  border:0px;
 }
 
 #menu .mbetween a {
  display:block;
  width: 36px;
  height: 58px;
  position: relative;
  top: -13px;
  background: url('img/inmenulogo.png');
  background-position: -100px 0px;
 }
 
 #menu .mbetween a:hover {
  background: url('img/inmenulogo.png');
  background-position: -100px -58px;
 }
 
 #menu .last {
  width:40px;
  height: 45px;
  background: url('img/last.png');
 }
 
 #menu .mdonate a {
  display: block;
  width: 148px;
  height: 45px;
  float:right;
  background: url('img/inmenudownload.png');
  color: #FFFFFF;
  text-indent: -10px;
 }
 
 #menu .mdonate a:hover {
  background: url('img/inmenudownload.png');
  background-position: 0px -45px;
 }
 
 #menu li a {
  background: #CCCCCC url('img/menubar.png') 0px -90px;
  color: #2A2A2A;
  line-height: 45px;
  width: 148px;
  display: block;
  text-decoration: none;
  font-weight: bold;
  font-size: 11px;
  height: 45px;
  overflow: hidden;
 }
 
 #menu li a:hover {
  background: #FFFFFF url('img/menubar.png') 0px -135px;
  color:#FFFFFF;
 }
 
 #menu ul li ul {
  width: 201px;
  list-style: none;
  position: absolute;
  display: none;
 }
 
 #menu ul li ul li,
 #menu .active ul li ul li {
  width: 148px;
 }
 
 #menu ul li .subcap {
  background: url('img/sub_tail.png');
  display: block;
  width: 149px;
  height: 5px;
 }
 
 #menu ul li ul li a,
 #menu .active ul li ul li a {
  background: url('img/sub_bg.png');
  line-height: 25px;
  width: 142px;
  height: 22px;
  font-weight: normal;
  color: #2A2A2A;
  text-align: left;
  display: block;
  padding-left: 5px;
  border-left: 1px solid #8B7E57;
  border-right: 1px solid #8B7E57;
 }
 
 #menu ul li ul li a:hover,
 #menu .active ul li a:hover {
  background: #FBCA4C;
  color: #2A2A2A;
  text-decoration: none;
  font-weight: bold;
 }
 
 #menu li:hover ul ul,
 #menu li:hover ul ul ul {
  display: none;
 }
 
 #menu li:hover ul,
 #menu li li:hover ul,
 #menu li li li:hover ul {
  display: block;
  z-index:3;
 }
 
 .donate_header {
  display: block;
  position: relative;
  top: -80px;
  height: 180px;
  background: url('img/heart.png') no-repeat;
  background-position: 550px 10px;
  font-size: 26px;
  border-bottom: 1px solid #CCCCCC;
  margin-bottom: -70px;
  z-index: -100;
 }
 
 .donate_header .text {
  position:relative;
  left: 180px;
  top: 40px;
  text-align:center;
 }
 
 .donate_header b {
  color: #D50D35;
 }
 
 .download_header {
  height:160px;
  background: url('img/download_bg.png') no-repeat;
  background-position: 690px 10px;
  font-size:26px;
  border-bottom: 1px solid #CCCCCC;
  margin-bottom:8px;
 }
 
 .download_header .text {
  position:relative;
  left: 120px;
  top: 40px;
  text-align:center;
 }
 
 .download_header b {
  color: #D50D35;
 }
 
 .dlbutton2 a {
  background-color: #6AC221;
  border-radius: 10px 10px 10px 10px;
  display: block;
  font-size: 150%;
  font-weight: bold;
  margin: 10px 20px 0 0;
  padding: 10px;
  text-align: center;
  color: #FFFFFF;
 }
 
 .dlbutton2 a:hover {
  background: #81C72B;
  text-decoration: none;
 }
 
 .dlbutton2 img {
  float:right;
  position: relative;
  right: 45px;
  top: 8px;
 }
 
 .version {
  color: #FFFFFF;
  font-size: 75%;
  font-weight: normal;
 }
 
 #footer {
  background: #EBEBEB url('img/page_bg.png') repeat-x;
  font-size: 11px;
  padding-bottom: 20px;
  color: #333333;
  text-align: center;
  margin-top: 30px;
  height: 22em;
  width: 100%;
 }
 
 #sitemap {
  margin: auto;
  width: 900px;
  text-align: left;
 }
 
 #sitemap ul {
  list-style:none;
  float: left;
  width: 130px;
  margin-left: 20px;
  padding: 0px;
 }
 
 #sitemap li {
  font-size: 12px;
  line-height: 19px;
  padding: 0px;
 }
 
 #sitemap li {
  font-size: 12px;
  line-height: 19px;
  padding: 0px;
 }
 
 #sitemap ul li a {
  color: #555555;
  text-decoration: none;
 }
 
 #sitemap ul li a:hover {
  text-decoration: underline;
 }
 
 .social-icon {
   margin-top: 10px;
   width: 32px;
   padding-right: 5px;
 }
 
 hr {
   display: block;
   height: 1px;
   border: 0;
   border-top: 1px solid #ccc;
   margin: 1em 0;
   padding: 0; 
 }
 
 /* donation form */
 .tabs{
 	list-style: none;
 	width: 100%;
 	float: left;
 	height: 290px;
 	padding-left: 0;
 	position: relative;
 }
 .tabs li label[for^=tab]{
 	clear: right;
 	margin-right: 10px	 !important;
 	background-color: transparent;
 	border: none;
 	border-radius: 4px;
 	width: 120px;
 	text-align: center;
 }
 .tabs .tab-content{
 	display: none;
 	position: absolute;
 	overflow: hidden;
 	right: 0;
 	top: 0;
 	width: 68%;
 	height: 100%;
 	border-left: 1px dotted #ccc;
 	padding-left: 20px;
 }
 .tabs [id^="tab"]:checked ~ [id$="_tab"]{
 	display: block;
 }
 .download_div{
 	display:none;
 }
 
 textarea, select, input[type=text]{
 	box-sizing: border-box;
 	box-shadow: inset 0 1px 2px #ddd;
 	border: 1px solid #bbb;
 	border-radius: 4px;
 	padding: 5px;
 	width: 100%;
 }
 input[type=text]{
 	height: 31px;
 }
 input[type=text]:focus{
 	border: 1px solid #888;
 }
 select{
 	background-color: #fff;
 }
 
 /* donation list */
 .two-column {
     -webkit-column-count: 2; /* Chrome, Safari, Opera */
     -moz-column-count: 2; /* Firefox */
     column-count: 2;
 	list-style: none;
 	padding-left: 15px;
 }
 .three-column {
     -webkit-column-count: 3; /* Chrome, Safari, Opera */
     -moz-column-count: 3; /* Firefox */
     column-count: 3;
 	list-style: none;
 	padding-left: 15px;
 }
 .two-column > li, .three-column > li{
 	margin: 0 5px 10px !important;
 	float: none;
 }
 #sponsors > h3 {
 	margin: 20px 0px 5px;
 	padding-bottom: 5px;
 }
 .sponsornames {
 	padding: 10px;
 	background-color: #eee;
 }
 .sponsornames > h4 {
 	font-size: 17px;
 	margin: 10px 15px;
 	border-bottom: 1px dotted #555;
 	padding-bottom: 5px;
 }
 
 .pay_div{
 	width: 100%;
 }
 
 .amountlabel {
 	margin: 15px 0 20px 0;
 	float: left;
 	clear: right;
 	width: 100%;
 }
 .amountlabel > input[type="radio"]{
 	display:none;
 }
 .amountlabel > label{
 	border-radius: 4px;
 	font-size: 16px;
 	padding: 10px 15px;
 	text-align: center;
 	margin: 0 7px 1px 3px;
 	font-weight: bold;
 	width: 65px;
 }
 
 /*** donate button colors ***/
 /* inactive */
 .amountlabel > input + label,
 .switch-field input + label,
 .donateButton {
     color: white;
 }
 .amountlabel > label,
 .switch-field label {
 	background-color: rgba(180,180,180,0.75);
 }
 
 /* hover */
 .amountlabel > label:hover,
 .amountlabel > input[type="radio"]:hover + label:hover,
 .switch-field label:hover,
 .donateButton:hover {
 	background-color: #8fc8d2;
     cursor: pointer;
 }
 
 /* active */
 .amountlabel > input[type="radio"]:checked + label,
 .amountlabel > label > input[type="number"]:focus + label,
 .switch-field input:checked + label,
 .donateButton {
 	background-color: #179bd7;
 }
 
 
 
 input[type=number]::-webkit-outer-spin-button,
 input[type=number]::-webkit-inner-spin-button {
       -webkit-appearance: none;
       margin: 0;
 }
 
 input[type=number] {
       -moz-appearance:textfield;
 }
 
 .amountlabel > label > input[type="number"]{
       background-color: transparent;
       color: white;
       border: none;
       border-bottom: 1px solid;
       border-radius: 0px;
       box-shadow: none;
       height: 20px;
       font-size: 18px;
       font-family: arial, helvetica, sans-serif;      
       text-align: center;
       width: 45px;
       font-weight: normal;
 }
 
 #freeamountLabel{
      padding: 0;
 }
 
 .switch-field {
   padding: 15px 0 15px 0;
   margin: 5px 0 5px 0;
   overflow: hidden;
   width: 50%;
   display: inline;
 }
 
 #donation_frq{
   clear: right;
 }
 
 .switch-title {
   margin-bottom: 6px;
 }
 
 .switch-field input {
   display: none;
 }
 
 .switch-field label {
   float: left;
 }
 
 .switch-field label {
   display: inline-block;
   width: 60px;
   font-size: 12px;
   font-weight: bold;
   text-align: center;
   text-shadow: none;
   padding: 3px 14px;
   border: none;
 }
 
 .switch-field input:checked + label {
   -webkit-box-shadow: none;
   box-shadow: none;
 }
 
 .switch-field label:first-of-type {
   border-radius: 4px 0 0 4px;
   margin: 0 0 0 3px;
 }
 
 .switch-field label:last-of-type {
   border-radius: 0 4px 4px 0;
   margin: 0 11px 10px -1px;
 }
 
 .switches{
   width: 100%;
 }
diff --git a/web/header.m4 b/web/header.m4
index 32c4a638..3e7754b8 100644
--- a/web/header.m4
+++ b/web/header.m4
@@ -1,101 +1,101 @@
   m4_ifdef(`FANCY_HEADER', `
   <div class="fancy_intro">
    <div id="download_button">
      m4_ifelse(LANG_DE, `1', `
      <a href="get-gpg4win-de.html">
      <span class="text">
       Download<br />Gpg4win VERSION
      </span></a>', `
      <a href="get-gpg4win.html">
      <span class="text">
       Download<br />Gpg4win VERSION
      </span></a>')
    </div>
    <div class="download_button_links">
      m4_ifelse(LANG_DE, `1', `
      <a href="download-de.html">Details</a>', `
      <a href="download.html">Details</a>')
      &middot;
      m4_ifelse(LANG_DE, `1', `
      <a href="change-history-de.html">Änderungshistorie</a>', `
      <a href="change-history.html">Change History</a>')
      &middot;
      m4_ifelse(LANG_DE, `1', `
      <a href="package-integrity-de.html">Integrität prüfen</a>', `
      <a href="package-integrity.html">Check integrity</a>')
    </div>
    <br/>
 <!-- BETA
    <div id="download_button_mini">
      m4_ifelse(LANG_DE, `1', `
      <a class="dmini_button" href="version3.1.3-de.html">
      <span class="text">
       Try BETA_VERSION
      </span></a>', `
      <a class="dmini_button" href="version3.1.3.html">
      <span class="text">
       Try BETA_VERSION
      </span></a>')
    </div>
    <div class="h_text_beta">
 -->
    <div class="h_text">
+   <small>2021-12-21</small><br>
+   <span class="serif_word"><img src="img/bulletin.png" alt"" />
+     m4_ifelse(LANG_DE, `1', `
+      <a href="https://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2021-December/000058.html">
+      Gpg4win 4.0.0 veröffentlicht</a>
+      </span>',`
+      <a href="https://lists.wald.intevation.org/pipermail/gpg4win-announce/2021-December/000094.html">
+        Gpg4win 4.0.0 released
+      </a>
+      </span>')
+   <p></p>
    <small>2021-10-19</small><br>
    <span class="serif_word"><img src="img/bulletin.png" alt"" />
      m4_ifelse(LANG_DE, `1', `
       <a href="https://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2021-October/000057.html">Auf GnuPG 2.2.32 aktualisieren
       </a></span>',`
       <a href="https://lists.wald.intevation.org/pipermail/gpg4win-announce/2021-October/000093.html">
         Update to GnuPG 2.2.32
       </a></span>')
    <p></p>
    <small>2021-06-11</small><br>
    <span class="serif_word"><img src="img/bulletin.png" alt"" />
      m4_ifelse(LANG_DE, `1', `
       <a href="https://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2021-June/000056.html">Gpg4win 3.1.16 veröffentlicht
       </a></span>',`
       <a href="https://lists.wald.intevation.org/pipermail/gpg4win-announce/2021-June/000092.html">
         Gpg4win 3.1.16 released
       </a></span>')
    <p></p>
-   <small>2021-01-12</small><br>
-   <span class="serif_word"><img src="img/bulletin.png" alt"" />
-     m4_ifelse(LANG_DE, `1', `
-      <a href="https://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2021-January/000055.html">
-      Gpg4win 3.1.15 veröffentlicht</a>
-      </span>',`
-      <a href="https://lists.wald.intevation.org/pipermail/gpg4win-announce/2021-January/000091.html">
-        Gpg4win 3.1.15 released
-      </a>
-      </span>')
-   <p></p>
    <div class="limiter"></div>
    <p>
      m4_ifelse(LANG_DE, `1', `
      <a href="newsarchive-de.html">Newsarchiv</a>', `
      <a href="newsarchive.html">Archived News</a>')
     </p>
    </div>
   </div>', `
   <div class="mini_intro">
    <div id="breadcrum">m4_ifelse(LANG_DE, `1', `<a href="index-de.html">', `<a
    href="index.html">')Home</a> &raquo;
    m4_ifelse(LANG_DE, `1', `
    m4_ifelse(MAIN, `about', `Über Gpg4win')
    m4_ifelse(MAIN, `doc', `Dokumentation')
    m4_ifelse(MAIN, `community', `Gemeinschaft')
    m4_ifelse(MAIN, `support', `Support')
    m4_ifelse(MAIN, `download', `Download')
    m4_ifelse(MAIN, `donate', `Spenden')
    ')
    m4_ifelse(LANG_DE, `0', `
    m4_ifelse(MAIN, `about', `About Gpg4win')
    m4_ifelse(MAIN, `doc', `Documentation')
    m4_ifelse(MAIN, `community', `Community')
    m4_ifelse(MAIN, `support', `Support')
    m4_ifelse(MAIN, `download', `Download')
    m4_ifelse(MAIN, `donate', `Donate')
    ')
    </div>
    </div><br clear="all" />
   ')
diff --git a/web/newsarchive-de.htm4 b/web/newsarchive-de.htm4
index af2aaccb..f97edbc5 100644
--- a/web/newsarchive-de.htm4
+++ b/web/newsarchive-de.htm4
@@ -1,295 +1,302 @@
 m4_dnl                                                       -*-html-*-
 m4_include(`template.m4')
 m4_dnl $Id$
 
 m4_define(`DE')
 m4_define(`EN_FILE', `newsarchive.html')
 m4_define(`TITLE', `Newsarchiv')
 PAGE_START
 
 <div id="intro">
 <h2>Newsarchiv</h2>
 <p>
 Rückblick auf Gpg4win-Bekanntmachungen aus den letzten Jahren.
 Aktuelle Meldungen gibt es auf der <a href="index-de.html">Startseite</a>.
 </p>
 </div>
 
 <div id="main">
+<h2>2021</h2>
+<ul>
+    <li>
+      <a href="https://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2021-January/000055.html">
+          2020-01-12: Gpg4win 3.1.15 veröffentlicht</a>
+    </li>
+</ul>
 <h2>2020</h2>
 <ul>
     <li>
       <a href="https://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2020-November/000054.html">2020-11-25: Gpg4win 3.1.14 veröffentlicht</a>
     </li>
     <li>
       <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2020-September/000053.html">
           2020-09-04: Gpg4win 3.1.13 veröffentlicht</a>
     </li>
     <li>
       <a
           href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2020-July/000052.html">
           2020-07-24: Gpg4win 3.1.12 veröffentlicht</a>
     </li>
     <li>
       <a
           href="https://gnupg.com/20200107-freigabe-vs-nfd.html">2020-01-07: Gpg4win für VS-NfD
           freigegeben
       </a>
     </li>
 </ul>
 <h2>2019</h2>
 <ul>
     <li>
       <a
           href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2019-December/000051.html">2019-12-17: Gpg4win 3.1.11 veröffentlicht
       </a>
     </li>
     <li>
       <a
           href="3.1.10-announcement-de.html">2019-07-14: Gpg4win 3.1.10 veröffentlicht
       </a>
     </li>
     <li>
       <a
           href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2019-June/000049.html">2019-06-15: Gpg4win 3.1.9 veröffentlicht
       </a>
     </li>
     <li>
       <a
           href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2019-June/000048.html">2019-06-06: Gpg4win 3.1.8 veröffentlicht
     </li>
     <li>
         <a href="statement-spoofing.html">2019-04-30 Detecting spoofed email signatures</a>
     </li>
     <li>
       <a
           href="http://lists.wald.intevation.org/pipermail/gpg4win-users-de/2019-March/001028.html">2019-03-28: Gpg4win 3.1.7 veröffentlicht
     </li>
     <li>
     <a
      href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2019-March/000047.html">2019-03-27:
      Gpg4win 3.1.6 veröffentlicht
     </a>
     </li>
 </ul>
 
 <h2>2018</h2>
 <ul>
     <li>
     <a
      href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2018-November/000046.html">2018-11-13:
      Gpg4win 3.1.5 veröffentlicht
     </a>
     </li>
     <li>
     <a
      href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2018-October/000045.html">2018-10-18:
      Gpg4win 3.1.4 veröffentlicht
     </a>
     </li>
     <li>
     <a
      href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2018-August/000044.html">2018-08-31: Gpg4win 3.1.3 veröffentlicht
     </a>
     </li>
     <li>
     <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2018-June/000043.html">
     2018-06-17: Gpg4win 3.1.2 veröffentlicht</a>
     </li>
     <li><a href="statement-efail.html">2018-05-17: Stellungnahme zu Efail (en)</a></li>
     <li><a
     href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2018-May/000042.html">
     2018-05-03: Gpg4win 3.1.1 veröffentlicht
     </a></li>
     <li><a
      href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2018-April/000041.html">
      2018-04-13: Gpg4win 3.1.0 veröffentlicht</a></li>
     <li><a
      href="version3.1-de.html">
      2018-03-08: Gpg4win 3.1.0 beta veröffentlicht</a></li>
     <li><a
      href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2018-January/000040.html">
      2018-01-13: Gpg4win 3.0.3 veröffentlicht</a></li>
 </ul>
 
 <h2>2017</h2>
 <ul>
     <li><a
     href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2017-December/000039.html">2017-12-08:
     Gpg4win 3.0.2 veröffentlicht</a></li>
     <li><a href="version3-de.html">2017-09-20 Gpg4win 3.0.0 veröffentlicht</a></li>
     <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2017-August/000072.html">
     2017-08-24: Gpg4win 3.0 erreicht Release Candidate Status</a></li>
     <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2017-July/000036.html">
             2017-07-06: Gpg4win 2.3.4 veröffentlicht</a></li>
    <p></p>
 </ul>
 
 <h2>2016</h2>
 <ul>
     <li>
     <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2016-August/000035.html">
     2016-08-18: Gpg4win 2.3.3 veröffentlicht</a>
     </li>
     <li>
     <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2016-July/000034.html">
     2016-07-05: Gpg4win 2.3.2 veröffentlicht</a>
     </li>
     <li>
     <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2016-April/000033.html">
     2016-04-05: Gpg4win 2.3.1 veröffentlicht</a>
     </li>
 </ul>
 
 
 <h2>2015</h2>
 <ul>
     <li>
     <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2015-November/000032.html">
     2015-11-25: Gpg4win 2.3.0 veröffentlicht</a>
     <br><small><a href="pm-20151125-de.html">Pressemitteilung</a></small>
     <li>
     <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2015-September/000030.html">
     2015-09-09: Gpg4win 2.2.6 veröffentlicht</a>
     <li>
     <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2015-July/000029.html">
     2015-07-10: Gpg4win 2.2.5 veröffentlicht</a>
     <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2015-March/000027.html">
     2015-03-18: Gpg4win 2.2.4 veröffentlicht</a>
 </ul>
 <h2>2014</h2>
 <ul>
     <li><a
         href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2014-November/000026.html">2014-11-26:
         Gpg4win 2.2.3 veröffentlicht</a>
     </li>
     <li><a
         href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2014-September/000025.html">2014-09-04:
         Gpg4win 2.2.2 veröffentlicht</a>
     </li>
 </ul>
 <h2>2013</h2>
 <ul>
     <li><a
         href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2013-October/000023.html">2013-10-07:
         Gpg4win 2.2.1 veröffentlicht</a>
     </li>
     <li><a
         href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2013-August/000022.html">2013-08-21:
         Gpg4win 2.2.0 veröffentlicht</a>
     </li>
     <li><a
         href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2013-July/000020.html">2013-07-16:
         Gpg4win 2.2.0-beta2 veröffentlicht</a></li>
     <li><a 
         href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2013-May/000054.html">2013-05-31:
         Gpg4win 2.1.1 released</a>
     </li>
     <li><a
         href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2013-May/000017.html">2013-05-16:
         Gpg4win 2.1.1-beta197 veröffentlicht</a>
     </li>
 </ul>
 
 <h2>2012</h2>
 <ul class="newslist">
     <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2012-May/000016.html"
      >2012-05-04: Gpg4win 2.1.1 Beta veröffentlicht</a>
     </li>
 </ul>
 
 <h2>2011</h2>
 <ul class="newslist">
     <li><a
 href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2011-March/000015.html">2011-03-15:
 Gpg4win 2.1.0 veröffentlicht</a>
     <p><a
 href="https://www.bsi.bund.de/`DE'/Presse/Pressemitteilungen/Presse2011/Gpg4win_neue_Version_15032011.html">Pressemitteilung</a> (in Zusammenarbeit mit dem BSI)</p>
     </li>
 
     <li><a href="download-de.html">2011-02-04: Gpg4win 2.1.0-rc2
 veröffentlicht</a>
     <p>Diese zweite Vorabversion von 2.1.0 enthält wichtige Aktualisierungen in
     GnuPG und Kleopatra.
     </p></li>
 </ul>
 
 
 <h2>2010</h2>
 
 <ul class="newslist">
     <li><a href="download-de.html">2010-12-20: Gpg4win 2.1.0-rc1 veröffentlicht
     <p>Diese erste Vorabversion von 2.1.0 enthält wichtige Verbesserungen in
     Kleopatra, Pinentry und GnuPG. Details in der
     Bekanntmachung.</p></a></li>
 
     <li><a href="download-de.html">
     2010-09-02: Gpg4win 2.1.0-beta1 veröffentlicht
     <p>Diese Version bringt u.a. viele Verbesserungen in Kleopatra und GnuPG mit.
     Details in der Bekanntmachung.</p></a></li>
 
     <li><a href="download-de.html">
     2010-09-01: Englisches Gpg4win-Kompendium 3.0.0-beta1 veröffentlicht
     <p>Das Gpg4win-Kompendium ist in einer ersten englischen
     Übersetung erschienen. Details in der Bekanntmachung.</p></a></li>
 
     <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2010-July/000010.html"
     >2010-07-28: Gpg4win 2.0.4 veröffentlicht
     <p>Security-Fix für GPGSM (GnuPG). Details in der Bekanntmachung.</p></a></li>
 
     <li><a href="donate-de.html">2010-06-15: Neue Gpg4win-Spenden-Seite
     <p>Unterstützen Sie die Gpg4win-Initiative und erscheinen Sie auf
     dieser Spenderliste!</p></a></li>
 
     <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2010-June/000009.html">
     2010-05-29: Gpg4win 2.0.3 veröffentlicht
     <p>Details in der Bekanntmachung.</p></a></li>
 
     <li><a href="documentation-de.html">
     2010-05-28: Gpg4win-Kompendium 3.0.0 ist veröffentlicht
     <p>Diese vollständige überarbeitete, deutschprachige
     Übersichtsdokumentation zu Gpg4win2 ermöglicht Einsteigern und
     Fortgeschrittenen einen einfachen Einstieg in die Welt der
     Kryptografie mit Gpg4win. Das Kompendium ist verfügbar als PDF- und HTML-Fassung.</p></a></li>
 
     <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2010-April/000007.html">
     2010-04-13: Gpg4win 2.0.2 ist veröffentlicht
     <p>Diese Version ist praktisch identisch zu dem Release Candidate
     2.0.2 RC2, bringt zusätzlich aber das Kompendium 3.0.0 RC1 mit.
     Details in der Bekanntmachung.</p></a></li>
 
     <li><a href="download-de.html">2010-04-01: Gpg4win-Kompendium 3.0.0 RC1 ist veröffentlicht
     <p>Dies ist die letzte Vorabfassung für die im April/Mail 2010 erscheinende
     finale Version 3.0.0 des deutschsprachigen Kompendiums.</p></a></li>
 
     <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2010-March/000005.html">2010-03-05: Gpg4win 2.0.2 RC2 ist veröffentlicht
     <p>Diese Version bringt u.a. viele Verbesserungen in Kleopatra und Pinentry
     mit. Detail in der Bekanntmachung.</p></a></li>
 
     <li><a href="download-de.html">2010-02-04: Gpg4win 2.0.2 RC1 ist veröffentlicht
     <p>Diese Version bringt u.a. viele Verbesserungen in Kleopatra, GpgOL
     und GnuPG mit.</p></a></li>
 </ul>
 
 <h2>2009</h2>
 
 <ul class="newslist">
     <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2009-September/000004.html">
     2009-09-28: Gpg4win 2.0.1 ist veröffentlicht
     <p>Diese Version ist praktisch identisch zu dem Release Candidate
     2.0.1 RC1.</p></a></li>
 
     <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2009-September/000001.html">
     2009-09-01: Outlook-Nutzer sollten Gpg4win 2.0.1 RC1 herunterladen
     <p>Verzögerungen machten Outlook 2003 oder 2007 für viele Anwender unbenutzbar;
     Gpg4win 2.0.1 RC1 adressiert diese Probleme.
     Hinweis: E-Mails per Exchange von Outlook/GpgOL zu senden geht weiterhin nicht.</p></a></li>
 
     <li><a href="#">2009-08-19: Smartcards verwenden mit Gpg4win 2.0.0
     <p>Hinweise für die Nutzung der unterstützen OpenPGP- und
     X.509-Smartcards mit Kleopatra finden Sie in der aktualisierten README-Datei.</p></a></li>
 
     <li><a href="news-20090812-de.html">2009-08-12: Gpg4win 2.0.0 ist veröffentlicht
     <p>Zur Pressemitteilung</p></a></li>
 </ul>
 </div>
diff --git a/web/newsarchive.htm4 b/web/newsarchive.htm4
index 440829ab..11e862a0 100644
--- a/web/newsarchive.htm4
+++ b/web/newsarchive.htm4
@@ -1,276 +1,283 @@
 m4_dnl                                                          -*-html-*-
 m4_include(`template.m4')
 m4_dnl $Id$
 
 m4_define(`EN')
 m4_define(`DE_FILE', `newsarchive-de.html')
 m4_define(`TITLE', `News Archive')
 PAGE_START
 
 <div id="intro">
 <h2>News Archive</h2>
 <p>
 The Gpg4win announcements of the last years.
 The latest news are placed at the <a href="./">welcome page</a>.
 </p>
 </div>
 
 
 <div id="main">
+<h2>2021</h2>
+<ul>
+    <li>
+      <a href="ttps://lists.wald.intevation.org/pipermail/gpg4win-announce/2021-January/000091.html">
+          2020-01-12: Gpg4win 3.1.15 released</a>
+    </li>
+</ul>
 <h2>2020</h2>
 <ul>
     <li>
       <a href="https://lists.wald.intevation.org/pipermail/gpg4win-announce/2020-November/000090.html">
           2020-11-25: Gpg4win 3.1.14 released</a>
     </li>
     <li>
       <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2020-September/000089.html">
            2020-09-04: Gpg4win 3.1.13 released
       </a>
     </li>
     <li>
         <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2020-July/000088.html">
            2020-07-24: Gpg4win 3.1.12 released</a>
     </li>
 </ul>
 <h2>2019</h2>
 <ul>
     <li>
       <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2019-December/000087.html">
         2019-12-17: Gpg4win 3.1.11 released
       </a>
     </li>
     <li>
       <a
           href="3.1.10-announcement.html">2019-07-14: Gpg4win 3.1.10 released
       </a>
     </li>
     <li>
       <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2019-June/000085.html">
         2019-06-15: Gpg4win 3.1.9 released
       </a>
     </li>
     <li>
       <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2019-June/000084.html">
         2019-06-06: Gpg4win 3.1.8 released
     </li>
     <li>
         <a href="statement-spoofing.html">2019-04-30 Detecting spoofed email signatures</a>
     </li>
     <li>
       <a href="http://lists.wald.intevation.org/pipermail/gpg4win-users-en/2019-March/001556.html">
         2019-03-28: Gpg4win 3.1.7 released
     </li>
     <li>
       <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2019-March/000083.html">
         2019-03-27: Gpg4win 3.1.6 released
       </a>
     </li>
 </ul>
 
 <h2>2018</h2>
 <ul>
     <li>
       <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2018-November/000082.html">
         2018-11-13: Gpg4win 3.1.5 released
       </a>
     </li>
     <li>
       <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2018-October/000081.html">
         2018-10-18: Gpg4win 3.1.4 released
       </a>
     </li>
     <li>
       <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2018-August/000080.html">
         2018-08-31: Gpg4win 3.1.3 released
       </a>
     </li>
     <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2018-June/000079.html">
     2018-06-17: Gpg4win 3.1.2 released
     </a></li>
     <li><a href="statement-efail.html">2018-05-17: Statement on Efail</a></li>
     <li><a
     href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2018-May/000078.html">
     2018-05-03: Gpg4win 3.1.1 released</a></li>
     <li><a
      href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2018-April/000077.html">
      2018-04-13: Gpg4win 3.1.0 released</a></li>
     <li><a
      href="version3.1.html">
      2018-03-08: Gpg4win 3.1.0 beta released</a></li>
     <li><a
      href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2018-January/000076.html">
      2018-01-13: Gpg4win 3.0.3 released</a></li>
 </ul>
 
 <h2>2017</h2>
 <ul>
     <li><a
      href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2017-December/000075.html">
      2017-12-08: Gpg4win 3.0.2 released</a></li>
     <li><a href="version3.html">2017-09-20 Gpg4win 3.0.0 released</a></li>
     <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2017-August/000072.html">
     2017-08-24: Gpg4win 3.0 has release candidate status</a>
     <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2017-July/000071.html">
     2017-07-06: Gpg4win 2.3.4 released</a>
 </ul>
 
 <h2>2016</h2>
 <ul>
     <li>
     <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2016-August/000070.html">
     2016-08-18: Gpg4win 2.3.3 released</a>
     <li>
     <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2016-July/000069.html">
     2016-07-05: GPG4win 2.3.2 released</a>
     <li>
     <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2016-April/000068.html">
     2016-04-05: GPG4win 2.3.1 released</a>
 </ul>
 
 <h2>2015</h2>
 <ul>
     <li>
     <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce-de/2015-November/000032.html">
     2015-11-25: Gpg4win 2.3.0 released</a>
     <br><small><a href="pm-20151125-de.html">Presse release (German)</a></small>
     <li>
     <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2015-September/000065.html">
     2015-09-09: Gpg4win 2.2.6 released</a>
     <li>
     <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2015-July/000064.html">
     2015-07-10: Gpg4win 2.2.5 released</a>
     <li>
     <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2015-March/000063.html">
     2015-03-18: Gpg4win 2.2.4 released</a>
 </ul>
 
 <h2>2014</h2>
 <ul>
     <li>
     <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2014-November/000062.html">
     2014-11-26: Gpg4win 2.2.3 released</a>
     <li>
     <a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2014-September/000061.html">
     2014-09-04: Gpg4win 2.2.2 released</a>
 </ul>
 
 <h2>2013</h2>
 <ul>
     <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2013-October/000059.html">2013-10-07: Gpg4win 2.2.1 released</a>
     </li>
 
     <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2013-August/000058.html">2013-08-21: Gpg4win 2.2.0 released</a>
     </li>
 
     <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2013-July/000056.html">2013-07-16: Gpg4win 2.2.0-beta2 released</a>
    </li>
 
     <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2013-May/000054.html">2013-05-31:
     Gpg4win 2.1.1 released</a>
     </li>
 
     <li><a href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2013-May/000053.html">2013-05-16:
     Gpg4win 2.1.1-beta197 released</a>
     </li>
 </ul>
 
 
 <h2>2012</h2>
    
 <dt><b>+++ 2012-05-04: Gpg4win 2.1.1 Beta released +++</b></dt>
 <dd>See the <a
 href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2012-May/000052.html">announcement</a>
 for details.
 <br></dd>
 
 
 <h2>2011</h2>
 
 <dt><b>+++ 2011-03-15: Gpg4win 2.1.0 released +++</b></dt>
 <dd>See the <a
 href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2011-March/000051.html">announcement</a>
 for details.
 <br></dd>
 
 <dt><b>+++ 2011-02-04: Gpg4win 2.1.0-rc2 released +++</b></dt>
 <dd>with important updates of GnuPG and Kleopatra.
 </dd>
 
 <h2>2010</h2>
 <dl>
 
 
 <dt><b>+++ 2010-07-28: Gpg4win 2.0.4 released +++</b></dt>
 <dd>Security fix for GPGSM (GnuPG). See the <a
 href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2010-July/000046.html">announcement</a>
 for details.
 </dd>
 
 <dt><b>+++ 2010-06-15: New donate page +++</b></dt>
 <dd>Please support Gpg4win and your name will appear in this <a
 href="donate.html">list of sponsors</a>.
 </dd>
 
 <dt><b>+++ 2010-05-29: Gpg4win 2.0.3 released +++</b></dt>
 <dd>See the <a
 href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2010-June/000045.html">announcement</a>
 for details.
 </dd>
 
 <dt><b>+++ 2010-05-28: German Gpg4win Compendium 3.0.0 released +++</b></dt>
 <dd>This is the final version 3.0.0 of the German Gpg4win Compendium
 - a new overview documentation for Gpg4win2. The translation into
   English is currently in progress.
   See <a href="documentation.html">documentation page</a> for more
 details.
 </dd>
 
 <dt><b>+++ 2010-04-13: Gpg4win 2.0.2 released +++</b></dt>
 <dd>This is basically the same as the 2.0.2 release candidate
 2 - additionally with the current compendium 3.0.0 RC1. See the <a
 href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2010-April/000043.html">announcement</a>
 for details.
 </dd>
 
 <dt><b>+++ 2010-04-01: German Gpg4win-Kompendium 3.0.0 RC1 released +++</b></dt>
 <dd>This is the last pre-release for the final version 3.0.0 of the
 German Gpg4win Kompendium - scheduled for april/may 2010. Afterwards
 the translation into English will start. </dd>
 
 <dt><b>+++ 2010-03-05: Gpg4win 2.0.2 RC2 released +++</b></dt>
 <dd>with a lot of improvements in Kleopatra and Pinentry. See the <a
 href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2010-March/000041.html">announcement</a>
 for details.</dd>
 
 <dt><b>+++ 2010-02-04: Gpg4win 2.0.2 RC1 released +++</b></dt>
 <dd>with a lot of improvements in Kleopatra, GpgOL and GnuPG.</dd>
 
 </dl>
 
 <h2>2009</h2>
 <dl>
 
 <dt><b>+++ 2009-09-28: Gpg4win 2.0.1 released +++</b></dt>
 <dd>This is basically the same as the release 2.0.1 candidate.
 See the <a
 href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2009-September/000040.html">announcement</a>
 for details.</dd>
 
 <dt><b>+++ 2009-09-01: Outlook users should download Gpg4win 2.0.1 RC1
 +++</b></dt>
 <dd>The delay problems frequently reported with Outlook 2003 and 2007
 are addressed by Gpg4win 2.0.1RC1.  Note that sending emails with Outlook/GpgOL
 over Exchange still does not work. See the <a
 href="http://lists.wald.intevation.org/pipermail/gpg4win-announce/2009-September/000039.html">announcement</a>
 for details.</dd>
 
 <dt><b>+++ 2009-08-19: Using smart cards with Gpg4win 2.0.0 +++</b></dt>
 <dd>Hints for using the supported OpenPGP and X.509 smart cards with
 Kleopatra are available in the updated <a href="doc/README.en.txt">README file</a>.</dd>
 
 <dt><b>+++ 2009-08-12: Gpg4win 2.0.0 released +++</b></dt>
 <dd>Read the <a href="news-20090812.html">Press release</a>.</dd>
 </dl>
 
 </div>
diff --git a/web/template_header.m4 b/web/template_header.m4
index cb66644c..f7d50eba 100644
--- a/web/template_header.m4
+++ b/web/template_header.m4
@@ -1,152 +1,150 @@
 m4_dnl                                                        -*-html-*-
 m4_dnl THIS IS INCLUDED BY `template.m4'
 m4_dnl DONT USE THIS FILE DIRECTLY
 m4_ifdef(`__TMPL_ROOT',,`m4_define(`__TMPL_ROOT',`')')
 
 m4_define(`__TITLE',m4_dnl
 I18N(`EN',`Secure E-Mail and File Encryption using GnuPG for Windows')`'m4_dnl
 I18N(`DE',`Sichere E-Mail- und Datei-Verschlüsselung mit GnuPG für Windows'))
 
 m4_ifdef(`__TMPL_PAGE_TITLE',,`m4_define(`__TMPL_PAGE_TITLE',`Gpg4win - 'TITLE)')
 
 m4_define(`LINK',
     `m4_ifelse($1, NO_LINK_FOR,
         `$2',
         `<a href="$1">$2</a>')')
 m4_define(`RQ',`m4_changequote(<,>)m4_dnl`
 'm4_changequote`'')m4_dnl trick for inserting right quotes from http://mbreen.com/m4.html#quotemacro
 
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta name="keywords" content="Gpg4win, GnuPG, GPA, GpgOL, E-Mail, Email, Windows, PGP, GPG, OpenPGP, S/MIME, Outlook, I18N(`EN', `Encryption, secure, security') I18N(`DE', `Verschlüsselung, sicher, Sicherheit')">
   <link rel="stylesheet" type="text/css" href="__TMPL_ROOT`'gpg4win.css">
   <link rel="shortcut icon" href="__TMPL_ROOT`'favicon.png" type="image/png" />
   <title>__TMPL_PAGE_TITLE</title>
  </head>
  <body>
  <a name="top"></a>
  <div class="wrapper">
  <div class="header">
   <div class="language_select">
    <img src="img/english.png"> LANG_LINK(`EN',`English', EN_FILE) |
    <img src="img/german.png"> LANG_LINK(`DE',`Deutsch', DE_FILE)
   </div>
  </div>
  m4_ifdef(`EN_FILE', `m4_define(`LANG_DE', `1')', `m4_define(`LANG_DE', `0')')
  <div id="menu">
   <ul>
    <li class="mlogo">
     m4_ifelse(LANG_DE, `1', `<a href="index-de.html" title="Startseite"></a>', `<a href="index.html" title="Home"></a>')
    </li>
-<!-- deactivate "what's new"-shield
    <li class="mwhatsnew">
-    m4_ifelse(LANG_DE, `1', `<a href="version3-de.html" title="Was ist in Version 3 neu"><div>Was ist neu</br>Version 3</div></a>', `<a href="version3.html" title="What is new in version 3"><div>What`'RQ()s new</br>Version 3</div></a>')
+    m4_ifelse(LANG_DE, `1', `<a href="version4-de.html" title="Was ist in Version 4 neu"><div>Was ist neu</br>Version 4</div></a>', `<a href="version4.html" title="What is new in version 4"><div>What`'RQ()s new</br>Version 4</div></a>')
    </li>
    <li class="mbetween">
     m4_ifelse(LANG_DE, `1', `<a href="index-de.html" title="Startseite"></a>', `<a href="index.html" title="Home"></a>')
    </li>
--->
    MENU(`about', `Über Gpg4win', `About Gpg4win', `about', MAIN, LANG_DE)
     <ul>
      MENU(`about', `Über Gpg4win', `About Gpg4win', `about', SUB, LANG_DE)
      MENU(`features', `Funktionen', `Features', `features', SUB, LANG_DE)
      MENU(`system-requirements', `Systemvoraussetzungen', `System Requirements', `system-requirements', SUB, LANG_DE)
      MENU(`documentation', `Dokumentation', `Documentation', `documentation', SUB, LANG_DE)
      MENU(`screenshots', `Screenshots', `Screenshots', `screenshots', SUB, LANG_DE)
      MENU(`privacy-policy', `Datenschutzerklärung', `Privacy Policy', `privacy-policy', SUB, LANG_DE)
      <li class="subcap"></li>
     </ul>
    </li>
    MENU(`community', `Gemeinschaft', `Community', `community', MAIN, LANG_DE)
     <ul>
      MENU(`community', `Gemeinschaft', `Community', `community', SUB, LANG_DE)
      MENU(`contribute', `Zu Gpg4win beitragen', `Contribute to Gpg4win', `contribute', SUB, LANG_DE)
      <li class="subcap"></li>
     </ul>
    </li>
    MENU(`support', `Support', `Support', `support', MAIN, LANG_DE)
    </li>
    <li class="mdonate">
     m4_ifelse(LANG_DE, `1', `<a href="get-gpg4win-de.html">Download</a>', `<a href="get-gpg4win.html">Download</a>')
     </li>
   </ul>
  </div>
   m4_include(`header.m4')
   <div class="content">
    m4_divert(999)
   <br clear="all" />
   </div>
   </div>
 
   <div id="footer">
    <br>
    <div id="sitemap">
     <ul>
      <li><a href="index-de.html"></a></li>
      MENU(`download', `Alle Downloads', `All Downloads', `download', MAIN, LANG_DE)
      <li>
        <a href="https://twitter.com/gpg4win" target="_blank" title="Follow @gpg4win">
          <img src="img/twitter-icon.png" class="social-icon">
        </a>
 <!-- Our flattr account results in a 404. Needs to be fixed.
        <a href="https://flattr.com/thing/2053326/Gpg4win-Secure-email-and-file-encryption-with-GnuPG-for-Windows"
            target="_blank" title="Flattr this">
          <img src="img/flattr-icon.png" class="social-icon">
        </a>
 -->
        <a href="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpg4win.git;a=summary" target="_blank" title="Gpg4win git repository">
          <img src="img/git-icon.png" class="social-icon">
        </a>
      </li>
     </ul>
 
     <ul>
      <li><b>
      m4_ifelse(LANG_DE, `1', `Über Gpg4win', `About Gpg4win')
      </b></li>
      MENU(`about', `Über Gpg4win', `About Gpg4win', `about', MAIN, LANG_DE)
      MENU(`features', `Funktionen', `Features', `features', MAIN, LANG_DE)
      MENU(`system-requirements', `System Voraussetzungen', `System Requirements', `system-requirements', SUB, LANG_DE)
      MENU(`documentation', `Dokumentation', `Documentation', `documentation', SUB, LANG_DE)
      MENU(`screenshots', `Screenshots', `Screenshots', `screenshots', MAIN, LANG_DE)
      MENU(`privacy-policy', `Datenschutzerklärung', `Privacy Policy', `privacy-policy', SUB, LANG_DE)
     </ul>
     <ul>
      <li><b>
      m4_ifelse(LANG_DE, `1', `Gemeinschaft', `Community')
      </b></li>
      MENU(`community', `Gemeinschaft', `Community', `community', SUB, LANG_DE)
      MENU(`contribute', `Zu Gpg4win beitragen', `Contribute to Gpg4win', `contribute', SUB, LANG_DE)
      MENU(`reporting-bugs', `- Probleme melden', `- Reporting Bugs', `reporting-bugs', SUB, LANG_DE)
      MENU(`build-installer', `- Bau von Gpg4win', `- Building of Gpg4win', `build-installer', SUB, LANG_DE)
      MENU(`website-maintenance', `- Website pflegen', `- Maintaining Website', `website-maintenance', SUB, LANG_DE)
      </li>
      m4_ifelse(LANG_DE, `1', `<li><a href="localize-gpg4win.html">- Gpg4win übersetzen</a></li>', `<li><a href="localize-gpg4win.html">- Translating Gpg4win</a></li>')
     </ul>
     <ul>
      <li><b>Support</b></li>
      MENU(`support', `Support', `Support', `support', MAIN, LANG_DE)
     </ul>
     <ul>
      <li><b>
      m4_ifelse(LANG_DE, `1', `Diverses', `Misc')
      </b></li>
      MENU(`donate', `Spenden', `Donate', `donate', SUB, LANG_DE)
      MENU(`license', `Lizenz', `License', `license', SUB, LANG_DE)
      m4_ifelse(LANG_DE, `1', `<li><a href="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpg4win.git;a=summary">Quellcode</a></li>',
          `<li><a href="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpg4win.git;a=summary">Source Code</a></li>')
      <li><a href="https://wiki.gnupg.org">Wiki</a></li>
      m4_ifelse(LANG_DE, `1', `<li><a href="https://dev.gnupg.org/">Entwicklungsplattform</a></li>',
          `<li><a href="https://dev.gnupg.org/">Development Platform</a></li>')
      m4_ifelse(LANG_DE, `1', `<li><a href="Kurzstudie-Nachhaltige-FS-Beispiel-Gpg4win.html">Kurzstudie Gpg4win</a></li>',
          `<li><a href="ShortStudy-Sustainable-FS-example-Gpg4win.html">Short Study Gpg4win</a></li>')
      MENU(`links', `Links', `Links', `links', SUB, LANG_DE)
      MENU(`contributors', `Mitwirkende', `Contributors', `contributors', SUB, LANG_DE)
      MENU(`impressum', `Impressum', `Legal Notice', `impressum', SUB, LANG_DE)
     </ul>
   </div>
   </div>
    </body>
 </html>
 m4_divert
diff --git a/web/versions.m4 b/web/versions.m4
index 00b4d022..d20b06e8 100644
--- a/web/versions.m4
+++ b/web/versions.m4
@@ -1,38 +1,38 @@
-m4_define(`VERSION',`3.1.16')
-m4_define(`DL_DATE',`2021-06-11')
+m4_define(`VERSION',`4.0.0')
+m4_define(`DL_DATE',`2021-12-21')
 m4_define(`DOWNLOAD_URL',`https://files.gpg4win.org/gpg4win-VERSION.exe')
 m4_define(`DL_SIZE',`27.6 MByte')
 m4_define(`SDOWNLOAD_URL',`https://files.gpg4win.org/gpg4win-VERSION.tar.bz2')
 m4_define(`SDL_SIZE',`273 MByte')
 
 m4_dnl Paste output of mk-chksums here
-m4_define(`SHA1_SRC',`61802ffce7218aab4224d26ab74a8deca8fae770')
-m4_define(`SHA1_EXE',`cf91ad8618280d7f44257ec2e413aedfdcb18dea')
-m4_define(`SHA2_SRC',`d74fd2ff4c5ee241c6a55cc60a10899ea29d8ca4c5a316fc98fec41ad49d19e1')
-m4_define(`SHA2_EXE',`c499213ff3e14e93c3b245546994cc0e654ec267b40a188788665ae8f4e9f5ad')
-m4_define(`LEN_SRC',`272984804')
-m4_define(`LEN_EXE',`30136688')
+m4_define(`SHA1_SRC',`b70c9087e792f40b580d85e691ec0c3ac7b9c2a6')
+m4_define(`SHA1_EXE',`b9fca8774bdc3df737fa930255e2924e7ddf738a')
+m4_define(`SHA2_SRC',`3b1b29ec8aa0b3aa07c51066690770ca1837720ee7c73e1aac989eae0ebc6b1b')
+m4_define(`SHA2_EXE',`f83be101c5e9c23740d6fde55fd8fefebf4fafb7badcb3756d1f574b5ad37507')
+m4_define(`LEN_SRC',`276681282')
+m4_define(`LEN_EXE',`30664240')
 m4_dnl end paste
 
 m4_define(`DLPAGE',`I18N(`EN',`download.html')`'I18N(`DE',`download-de.html')')
 m4_define(`SOFTWAREOVERVIEW',`
 I18N(`EN', `<a href="https://www.gnupg.org/">GnuPG</a>')I18N(`DE', `<a href="https://www.gnupg.org/index.de.html">GnuPG</a>') 2.2.28
-<a href="https://www.kde.org/applications/utilities/kleopatra/">Kleopatra</a> 3.1.16
+<a href="https://www.kde.org/applications/utilities/kleopatra/">Kleopatra</a> 3.1.20
 I18N(`EN', `<a href="https://www.gnupg.org/related_software/gpa/index.html">GPA</a>')I18N(`DE', `<a href="https://www.gnupg.org/related_software/gpa/index.de.html">GPA</a>') 0.10.0
-<a href="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgol.git;a=summary">GpgOL</a> 2.5.0
+<a href="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgol.git;a=summary">GpgOL</a> 2.5.1
 <a href="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgex.git;a=summary">GpgEX</a> 1.0.6
 <a href="doc/de/gpg4win-compendium.html">Kompendium (de)</a> 4.0.1
 <a href="doc/en/gpg4win-compendium.html">Compendium (en)</a> 3.0.0
 ')
 
 m4_define(`COMPENDIUM_VERSION_DE',`4.0.1')
 m4_define(`COMPENDIUM_DATE_DE',`2018-04-03')
 m4_define(`DOWNLOAD_URL_COMPENDIUM_DE',`https://files.gpg4win.org/doc/gpg4win-compendium-de.pdf')
 m4_define(`DL_SIZE_COMPENDIUM_DE',`3 MByte')
 m4_define(`COMPENDIUM_VERSION_EN',`3.0.0')
 m4_define(`COMPENDIUM_DATE_EN',`2016-11-30')
 m4_define(`DOWNLOAD_URL_COMPENDIUM_EN',`https://files.gpg4win.org/doc/gpg4win-compendium-en.pdf')
 m4_define(`DL_SIZE_COMPENDIUM_EN',`3 MByte')
 
 m4_dnl m4_define(`BETA_VERSION', `3.1.3-beta28')
 m4_dnl m4_define(`BETA_SIZE', `27 MByte')