diff --git a/src/AnnouncementsEdit.ascx b/src/AnnouncementsEdit.ascx
index df6e46e..423d505 100644
--- a/src/AnnouncementsEdit.ascx
+++ b/src/AnnouncementsEdit.ascx
@@ -1,6 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="false" CodeBehind="AnnouncementsEdit.ascx.cs"
-    Inherits="DotNetNuke.Modules.Announcements.AnnouncementsEdit" %>
-<%@ Register Assembly="DotNetNuke" Namespace="DotNetNuke.UI.UserControls" TagPrefix="dnn" %>
+<%@ Control Language="C#" AutoEventWireup="false" CodeBehind="AnnouncementsEdit.ascx.cs" Inherits="DotNetNuke.Modules.Announcements.AnnouncementsEdit" %>
 <%@ Register TagPrefix="dnn" TagName="TextEditor" Src="~/controls/TextEditor.ascx" %>
 <%@ Register TagPrefix="dnn" TagName="Label" Src="~/controls/LabelControl.ascx" %>
 <%@ Register TagPrefix="dnn" TagName="Tracking" Src="~/controls/URLTrackingControl.ascx" %>
@@ -8,8 +6,6 @@
 <%@ Register TagPrefix="dnn" TagName="URL" Src="~/controls/URLControl.ascx" %>
 <%@ Register TagPrefix="dnn" TagName="FilePickerUploader" Src="~/controls/filepickeruploader.ascx" %>
 <%@ Import Namespace="DotNetNuke.Services.Localization" %>
-<%@ Register TagPrefix="dnn" Namespace="DotNetNuke.UI.WebControls" Assembly="DotNetNuke" %>
-<%@ Register TagPrefix="dnn" Namespace="DotNetNuke.Web.UI.WebControls.Internal" Assembly="DotNetNuke.Web" %>
 <div class="dnnForm dnnAnnouncementForm dnnClear" id="AnnouncementsForm">
     <ul class="dnnAdminTabNav dnnClear" id="">
         <li id="contentTab" runat="server"><a href="#dnnContent"><%=LocalizeString("content.Tab")%></a></li>
@@ -67,11 +63,11 @@
             </div>
             <div class="dnnFormItem">
                 <dnn:Label ID="plPublishDate" Suffix=":" ControlName="publishDate" runat="server" />
- 			    <div class="dateDiv"><dnn:DnnDateTimePicker ID="publishDate" runat="server" /></div>
+ 			    <div class="dateDiv"><asp:TextBox ID="publishDate" type="datetime-local" runat="server" /></div>
             </div>
             <div class="dnnFormItem">
                 <dnn:Label ID="plExpireDate" Suffix=":" ControlName="expireDate" runat="server" />
- 			    <div class="dateDiv"><dnn:DnnDateTimePicker ID="expireDate" runat="server" /></div>
+ 			    <div class="dateDiv"><asp:TextBox ID="expireDate" type="datetime-local" runat="server" /></div>
             </div>
         </fieldset>
     </div>
diff --git a/src/AnnouncementsEdit.ascx.cs b/src/AnnouncementsEdit.ascx.cs
index 48aea60..4b38064 100644
--- a/src/AnnouncementsEdit.ascx.cs
+++ b/src/AnnouncementsEdit.ascx.cs
@@ -27,12 +27,10 @@
 using System;
 using System.Data.SqlTypes;
 using System.Globalization;
-
+using System.Web.UI.WebControls;
 using DotNetNuke.Common;
 using DotNetNuke.Common.Utilities;
-using DotNetNuke.Entities.Portals;
 using DotNetNuke.Entities.Users;
-using DotNetNuke.Framework;
 using DotNetNuke.Framework.JavaScriptLibraries;
 using DotNetNuke.Modules.Announcements.Components.Business;
 using DotNetNuke.Modules.Announcements.Components.Common;
@@ -40,11 +38,9 @@
 using DotNetNuke.Modules.Announcements.MVP.Presenters;
 using DotNetNuke.Modules.Announcements.MVP.Views;
 using DotNetNuke.Services.Exceptions;
-using DotNetNuke.Services.Localization;
 using DotNetNuke.Web.Client;
 using DotNetNuke.Web.Client.ClientResourceManagement;
 using DotNetNuke.Web.Mvp;
-using DotNetNuke.Web.UI.WebControls.Internal;
 using WebFormsMvp;
 
 #endregion
@@ -206,13 +202,13 @@ private void BindForm()
                         (Model.AnnouncementInfo.PublishDate != (DateTime)SqlDateTime.Null))
                     {
                         var portalDateTime = TimeZoneInfo.ConvertTimeFromUtc(Model.AnnouncementInfo.PublishDate.Value, ModuleContext.PortalSettings.TimeZone);
-                        publishDate.SelectedDate = portalDateTime;
+                        publishDate.Text = portalDateTime.ToString("yyyy-MM-dd'T'HH:mm", CultureInfo.InvariantCulture);
                     }
                     if ((!Null.IsNull(Model.AnnouncementInfo.ExpireDate)) &&
                         (Model.AnnouncementInfo.ExpireDate != (DateTime)SqlDateTime.Null))
                     {
                         var portalDateTime = TimeZoneInfo.ConvertTimeFromUtc(Model.AnnouncementInfo.ExpireDate.Value, ModuleContext.PortalSettings.TimeZone);
-                        expireDate.SelectedDate = portalDateTime;
+                        expireDate.Text = portalDateTime.ToString("yyyy-MM-dd'T'HH:mm", CultureInfo.InvariantCulture);
                     }
 
                     var user = UserController.Instance.GetCurrentUserInfo();
@@ -280,13 +276,13 @@ private string ReturnURL
             }
         }
 
-        private DateTime? GetDateTimeValue(DnnDatePicker dnnDatePicker)
+        private DateTime? GetDateTimeValue(TextBox datePicker)
         {
             DateTime? resultValue = null;
 
-            if (dnnDatePicker.SelectedDate != null)
+            if (DateTime.TryParseExact(datePicker.Text, ["yyyy-MM-dd'T'HH:mm", "yyyy-MM-dd"], CultureInfo.InvariantCulture, DateTimeStyles.None, out var selectedDate))
             {
-                resultValue = dnnDatePicker.SelectedDate;
+                resultValue = selectedDate;
             }
 
             if (resultValue.HasValue)
@@ -297,19 +293,11 @@ private string ReturnURL
             return null;
         }
 
-        private DateTime? GetDateTimeValue(DnnDateTimePicker dnnDatePicker, DateTime defaultValue)
+        private DateTime? GetDateTimeValue(TextBox datePicker, DateTime defaultValue)
         {
-            DateTime? resultValue = GetDateTimeValue(dnnDatePicker);
-
-            if (!resultValue.HasValue)
-            {
-                resultValue = defaultValue;
-            }
-
-            return resultValue;
+            return GetDateTimeValue(datePicker) ?? defaultValue;
         }
 
-
     }
 
 }
diff --git a/src/AnnouncementsEdit.ascx.designer.cs b/src/AnnouncementsEdit.ascx.designer.cs
index 67b2b2c..850adcd 100644
--- a/src/AnnouncementsEdit.ascx.designer.cs
+++ b/src/AnnouncementsEdit.ascx.designer.cs
@@ -1,188 +1,188 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace DotNetNuke.Modules.Announcements
-{
-
-
-    public partial class AnnouncementsEdit
-    {
-
-        /// <summary>
-        /// contentTab control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl contentTab;
-
-        /// <summary>
-        /// imageLinksTab control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl imageLinksTab;
-
-        /// <summary>
-        /// publishingTab control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl publishingTab;
-
-        /// <summary>
-        /// auditingTab control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl auditingTab;
-
-        /// <summary>
-        /// txtTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox txtTitle;
-
-        /// <summary>
-        /// valTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.RequiredFieldValidator valTitle;
-
-        /// <summary>
-        /// valDescription control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.RequiredFieldValidator valDescription;
-
-        /// <summary>
-        /// plImage control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.UserControl plImage;
-
-        /// <summary>
-        /// plURL control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.UserControl plURL;
-
-        /// <summary>
-        /// plViewOrder control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.UserControl plViewOrder;
-
-        /// <summary>
-        /// txtViewOrder control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox txtViewOrder;
-
-        /// <summary>
-        /// valViewOrder control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.CompareValidator valViewOrder;
-
-        /// <summary>
-        /// plPublishDate control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.UserControl plPublishDate;
-
-        /// <summary>
-        /// publishDate control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::DotNetNuke.Web.UI.WebControls.Internal.DnnDateTimePicker publishDate;
-
-        /// <summary>
-        /// plExpireDate control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.UserControl plExpireDate;
-
-        /// <summary>
-        /// expireDate control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::DotNetNuke.Web.UI.WebControls.Internal.DnnDateTimePicker expireDate;
-
-        /// <summary>
-        /// cmdUpdate control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.LinkButton cmdUpdate;
-
-        /// <summary>
-        /// cmdDelete control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.LinkButton cmdDelete;
-
-        /// <summary>
-        /// cancelHyperLink control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.HyperLink cancelHyperLink;
-    }
-}
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace DotNetNuke.Modules.Announcements
+{
+
+
+    public partial class AnnouncementsEdit
+    {
+
+        /// <summary>
+        /// contentTab control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl contentTab;
+
+        /// <summary>
+        /// imageLinksTab control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl imageLinksTab;
+
+        /// <summary>
+        /// publishingTab control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl publishingTab;
+
+        /// <summary>
+        /// auditingTab control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl auditingTab;
+
+        /// <summary>
+        /// txtTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtTitle;
+
+        /// <summary>
+        /// valTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RequiredFieldValidator valTitle;
+
+        /// <summary>
+        /// valDescription control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RequiredFieldValidator valDescription;
+
+        /// <summary>
+        /// plImage control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UserControl plImage;
+
+        /// <summary>
+        /// plURL control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UserControl plURL;
+
+        /// <summary>
+        /// plViewOrder control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UserControl plViewOrder;
+
+        /// <summary>
+        /// txtViewOrder control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtViewOrder;
+
+        /// <summary>
+        /// valViewOrder control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.CompareValidator valViewOrder;
+
+        /// <summary>
+        /// plPublishDate control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UserControl plPublishDate;
+
+        /// <summary>
+        /// publishDate control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox publishDate;
+
+        /// <summary>
+        /// plExpireDate control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UserControl plExpireDate;
+
+        /// <summary>
+        /// expireDate control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox expireDate;
+
+        /// <summary>
+        /// cmdUpdate control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.LinkButton cmdUpdate;
+
+        /// <summary>
+        /// cmdDelete control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.LinkButton cmdDelete;
+
+        /// <summary>
+        /// cancelHyperLink control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HyperLink cancelHyperLink;
+    }
+}
diff --git a/src/AnnouncementsEdit.css b/src/AnnouncementsEdit.css
index 44df998..33d9292 100644
--- a/src/AnnouncementsEdit.css
+++ b/src/AnnouncementsEdit.css
@@ -2,7 +2,7 @@
     width: 420px;
 }
 
-.dateDiv { display: inline-block;width: 150px; margin-bottom: 20px;}
+.dateDiv { display: inline-block; margin-bottom: 20px;}
 
 .dnnFormItem .dateDiv input { width: 100%; }
 
diff --git a/src/DotNetNuke.Announcements.csproj b/src/DotNetNuke.Announcements.csproj
index 0100312..004f150 100644
--- a/src/DotNetNuke.Announcements.csproj
+++ b/src/DotNetNuke.Announcements.csproj
@@ -3,6 +3,7 @@
   <Import Project="..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props" Condition="Exists('..\packages\MSBuild.Microsoft.VisualStudio.Web.targets.14.0.0.3\build\MSBuild.Microsoft.VisualStudio.Web.targets.props')" />
   <PropertyGroup>
     <ExcludeFoldersFromDeployment>.vs</ExcludeFoldersFromDeployment>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>