From 53f8014730f21ea5b8902da711e8e329415298e9 Mon Sep 17 00:00:00 2001
From: Milan Perera <milan@wso2.com>
Date: Wed, 26 Sep 2018 12:45:36 +0530
Subject: [PATCH] Whitelabel devicemgt jaggeryapp

---
 .../devicemgt/app/conf/app-conf.json          |   2 +-
 .../devicemgt/app/conf/config.json            |   8 +-
 .../cdmf.page.cookie-policy/cookie-policy.hbs |  70 ++++++-------
 .../privacy-policy.hbs                        |  98 +++++++++---------
 .../app/pages/cdmf.page.register/register.hbs |   2 +-
 .../app/units/cdmf.unit.footer/footer.hbs     |   6 +-
 .../public/css/custom-desktop.css             |  29 ++++--
 .../app/units/cdmf.unit.ui.title/title.hbs    |   6 +-
 .../uuf.unit.favicon/public/img/favicon.png   | Bin 1923 -> 5143 bytes
 .../app/units/uuf.unit.footer/footer.hbs      |   4 +-
 .../app/units/uuf.unit.header.logo/logo.hbs   |   2 +-
 .../uuf.unit.header.logo/public/img/logo.png  | Bin 3112 -> 4200 bytes
 .../uuf.unit.theme/public/css/theme-wso2.css  |   4 +-
 13 files changed, 119 insertions(+), 112 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/app-conf.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/app-conf.json
index 65d3f51ceb1..6367533b959 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/app-conf.json
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/app-conf.json
@@ -1,5 +1,5 @@
 {
-    "appName": "WSO2 IoT Server",
+    "appName": "Entgra IoT Server",
     "cachingEnabled": false,
     "debuggingEnabled": false,
     "permissionRoot": "/",
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
index 406dde9f3a0..3b4f031c6d5 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
@@ -57,11 +57,11 @@
   },
   "generalConfig": {
     "host": "https://%iot.manager.host%:%iot.manager.https.port%",
-    "companyName": "WSO2 Carbon Device Manager",
-    "browserTitle": "WSO2 Device Manager",
+    "companyName": "Entgra Carbon Device Manager",
+    "browserTitle": "Entgra Device Manager",
     "copyrightPrefix": "\u00A9 %date-year%, ",
-    "copyrightOwner": "WSO2 Inc.",
-    "copyrightOwnersSite": "http://www.wso2.org",
+    "copyrightOwner": "Entgra",
+    "copyrightOwnersSite": "https://www.entgra.io/",
     "copyrightSuffix": " All Rights Reserved."
   },
   "scopes": [
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.cookie-policy/cookie-policy.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.cookie-policy/cookie-policy.hbs
index abaf293f3ca..67f867622b7 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.cookie-policy/cookie-policy.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.cookie-policy/cookie-policy.hbs
@@ -25,15 +25,15 @@
             <div class="alert alert-info"><h3>COOKIE POLICY</h3></div>
 
             <div class="panel-body">
-                <h3>About WSO2 IoT Server</h3>
-                <p>WSO2 IoT Server 3.3.0 is a complete solution that enables device manufacturers and enterprises to
+                <h3>About Entgra IoT Server</h3>
+                <p>Entgra IoT Server 3.4.0 is a complete solution that enables device manufacturers and enterprises to
                    connect and manage their devices, build apps, manage events, secure devices and data, and visualize
                    sensor data in a scalable manner.</p>
                 <p>It also offers a complete and secure Enterprise Mobility Management (EMM/MDM) solution that aims to
                    address mobile computing challenges faced by enterprises today. Supporting iOS, Android, and Windows
                    devices, it helps organizations deal with both Corporate Owned, Personally Enabled (COPE) and
                    employee-owned devices with the Bring Your Own Device (BYOD) concept.</p>
-                <p>WSO2 IoT Server 3.3.0 comes with advanced analytics, enabling users to analyze speed, proximity, and
+                <p>Entgra IoT Server 3.4.0 comes with advanced analytics, enabling users to analyze speed, proximity, and
                    geo-fencing information of devices including details of those in motion and stationary state.</p>
                 </p>
                 <h2>Cookie Policy</h2>
@@ -45,67 +45,67 @@
                    apps remember things about you. Other technologies, including Web storage and identifiers associated
                    with your device, may be used for similar purposes. In this policy, we use the term “cookies” to
                    discuss all of these technologies.</p>
-                <h3>How does WSO2 IoT Server 3.3.0 process cookies?</h3>
-                <p>WSO2 IoT Server 3.3.0 uses cookies to store and retrieve information on your browser. This
+                <h3>How does Entgra IoT Server 3.4.0 process cookies?</h3>
+                <p>Entgra IoT Server 3.4.0 uses cookies to store and retrieve information on your browser. This
                    information is used to provide a better user experience. Some cookies serve the purpose of allowing a
                    user to log in to the system, maintain sessions, and keep track of activities within the login
                    session.</p>
-                <p>Some cookies in WSO2 IoT Server 3.3.0 are used to personally identify you. However, the cookie
+                <p>Some cookies in Entgra IoT Server 3.4.0 are used to personally identify you. However, the cookie
                    lifetime ends once your session ends, i.e., after you log-out, or after the session expiry time has
                    elapsed.</p>
                 <p>Some cookies are simply used to give you a more personalised web experience, and these cannot be used
                    to identify you or your activities personally.</p>
                 <p>This Cookie Policy is part of the IoT Server <a href="{{@app.context}}/privacy-policy">Privacy Policy.</a>
                 </p>
-                <h3>What does WSO2 IoT Server 3.0.0 use cookies for?</h3>
-                <p>Cookies are used for two purposes in WSO2 IoT Server 3.3.0.</p>
+                <h3>What does Entgra IoT Server 3.0.0 use cookies for?</h3>
+                <p>Cookies are used for two purposes in Entgra IoT Server 3.4.0.</p>
                 <ol>
                     <li>To identify you and provide security</li>
                     <li>To provide a satisfying user experience.</li>
                 </ol>
 
                 <h4><u>Preferences</u></h4>
-                <p>WSO2 IoT Server 3.3.0 uses cookies to remember your settings and preferences and to auto-fill the
+                <p>Entgra IoT Server 3.4.0 uses cookies to remember your settings and preferences and to auto-fill the
                    fields to make your interactions with the site easier.</p>
                 <p>These cookies can not be used to personally identify you.</p>
 
                 <h4><u>Security</u></h4>
                 <ol>
-                    <li>WSO2 IoT Server 3.3.0 uses selected cookies to identify and prevent security risks. For example,
-                        WSO2 IoT Server 3.3.0 may use cookies to store your session information to prevent others from
+                    <li>Entgra IoT Server 3.4.0 uses selected cookies to identify and prevent security risks. For example,
+                        Entgra IoT Server 3.4.0 may use cookies to store your session information to prevent others from
                         changing your password without your username and password.
                     </li>
-                    <li>WSO2 IoT Server 3.3.0 uses session cookie to maintain your active session.</li>
-                    <li>WSO2 IoT Server 3.3.0 may use a temporary cookie when performing multi-factor authentication and
+                    <li>Entgra IoT Server 3.4.0 uses session cookie to maintain your active session.</li>
+                    <li>Entgra IoT Server 3.4.0 may use a temporary cookie when performing multi-factor authentication and
                         federated authentication.
                     </li>
-                    <li>WSO2 IoT Server 3.3.0 may use permanent cookies to detect the devices you have logged in
+                    <li>Entgra IoT Server 3.4.0 may use permanent cookies to detect the devices you have logged in
                         previously. This is to to calculate the <b>risk level</b> associated with your current login
                         attempt. Using these cookies protects you and your account from possible attacks.
                     </li>
                 </ol>
                 <h4><u>Performance</u></h4>
-                <p>WSO2 IoT Server 3.3.0 may use cookies to allow <b>Remember Me</b> functionalities.</p>
+                <p>Entgra IoT Server 3.4.0 may use cookies to allow <b>Remember Me</b> functionalities.</p>
                 <h4><u>Analytics</u></h4>
-                <p>WSO2 IoT Server 3.3.0 as a product does not use cookies for analytical purposes.</p>
+                <p>Entgra IoT Server 3.4.0 as a product does not use cookies for analytical purposes.</p>
                 <h4><u>Third party cookies</u></h4>
-                <p>Using WSO2 IoT Server 3.3.0 may cause third-party cookie to be set in your browser. WSO2 IoT Server
-                   3.3.0 has no control over how any of them operate. The third-party cookies that maybe set
+                <p>Using Entgra IoT Server 3.4.0 may cause third-party cookie to be set in your browser. Entgra IoT Server
+                   3.4.0 has no control over how any of them operate. The third-party cookies that maybe set
                    include:</p>
                 <ol>
-                    <li>Any social login sites. For example, third-party cookies may be set when WSO2 IoT Server 3.3.0
+                    <li>Any social login sites. For example, third-party cookies may be set when Entgra IoT Server 3.4.0
                         is configured to use “social” or “federated” login, and you opt to login with your “Social
                         Account”.
                     </li>
                     <li>Any third party federated login.</li>
                 </ol>
-                <p>WSO2 strongly advises you to refer the respective cookie policies of such sites carefully as WSO2 has
+                <p>Entgra strongly advises you to refer the respective cookie policies of such sites carefully as Entgra has
                    no knowledge or use on these cookies.</p>
-                <h3>What type of cookies does WSO2 IoT Server 3.3.0 use?</h3>
-                <p>WSO2 IoT Server 3.3.0 uses persistent cookies and session cookies. A persistent cookie helps WSO2 IS
-                   3.3.0 to recognize you as an existing user so that it is easier to return to WSO2 or interact with
-                   WSO2 IS 3.3.0 without signing in again. After you sign in, a persistent cookie stays in your browser
-                   and will be read by WSO2 IoT Server 3.3.0 when you return to WSO2 IoT Server 3.3.0.</p>
+                <h3>What type of cookies does Entgra IoT Server 3.4.0 use?</h3>
+                <p>Entgra IoT Server 3.4.0 uses persistent cookies and session cookies. A persistent cookie helps Entgra IS
+                   3.4.0 to recognize you as an existing user so that it is easier to return to Entgra or interact with
+                   Entgra IS 3.4.0 without signing in again. After you sign in, a persistent cookie stays in your browser
+                   and will be read by Entgra IoT Server 3.4.0 when you return to Entgra IoT Server 3.4.0.</p>
                 <p>A session cookie is a cookie that is erased when the user closes the Web browser. The session cookie
                    is stored in temporarily and is not retained after the browser is closed. Session cookies do not
                    collect information from the user’s computer.</p>
@@ -114,9 +114,9 @@
                    for websites to set cookies, you may worsen your overall user experience since it will no longer be
                    personalized to you. It may also stop you from saving customized settings like login information.
                    Most likely, disabling cookies will make it unable for you to use authentication and authorization
-                   functionalities offered by WSO2 IoT Server 3.3.0.</p>
+                   functionalities offered by Entgra IoT Server 3.4.0.</p>
                 <p>If you have any questions or concerns regarding the use of cookies, please contact the entity or
-                   individuals (or their data protection officer, if applicable) running this WSO2 IoT Server 3.3.0
+                   individuals (or their data protection officer, if applicable) running this Entgra IoT Server 3.4.0
                    instance.</p>
                 <h3>What are the cookies used?</h3>
                 <table class="table table-striped table-bordered">
@@ -150,17 +150,17 @@
                     </tbody>
                 </table>
                 <h3>Disclaimer</h3>
-                <p>This cookie policy is only for illustrative purposes of the product WSO2 IoT Server 3.3.0. The
+                <p>This cookie policy is only for illustrative purposes of the product Entgra IoT Server 3.4.0. The
                    content in the policy is technically correct at the time of the product shipment. The
-                   entity,organization or individual that runs this WSO2 IoT Server 3.3.0 instance has full authority
-                   and responsibility with regard to the effective Cookie Policy. WSO2, its employees, partners, and
+                   entity,organization or individual that runs this Entgra IoT Server 3.4.0 instance has full authority
+                   and responsibility with regard to the effective Cookie Policy. Entgra, its employees, partners, and
                    affiliates do not have access to and do not require, store, process or control any of the data,
-                   including personal data contained in WSO2 IoT Server 3.3.0. All data, including personal data is
-                   controlled and processed by the entity, organization or individual running WSO2 IoT Server 3.3.0.
-                   WSO2, its employees partners and affiliates are not a data processor or a data controller within the
-                   meaning of any data privacy regulations. WSO2 does not provide any warranties or undertake any
+                   including personal data contained in Entgra IoT Server 3.4.0. All data, including personal data is
+                   controlled and processed by the entity, organization or individual running Entgra IoT Server 3.4.0.
+                   Entgra, its employees partners and affiliates are not a data processor or a data controller within the
+                   meaning of any data privacy regulations. Entgra does not provide any warranties or undertake any
                    responsibility or liability in connection with the lawfulness or the manner and purposes for which
-                   WSO2 IoT Server 3.3.0 is used by such entities, organizations or persons.</p>
+                   Entgra IoT Server 3.4.0 is used by such entities, organizations or persons.</p>
             </div>
         </div>
     </div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.privacy-policy/privacy-policy.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.privacy-policy/privacy-policy.hbs
index bb65e7be653..b2f67283ee5 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.privacy-policy/privacy-policy.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.privacy-policy/privacy-policy.hbs
@@ -25,29 +25,29 @@
             <div class="alert alert-info"><h3>PRIVACY POLICY</h3></div>
 
             <div class="panel-body">
-                <h3>About WSO2 IoT Server</h3>
-                <p>WSO2 IoT Server is a complete solution that enables device manufacturers and enterprises to connect
+                <h3>About Entgra IoT Server</h3>
+                <p>Entgra IoT Server is a complete solution that enables device manufacturers and enterprises to connect
                    and manage their devices, build apps, manage events, secure devices and data, and visualize sensor
                    data in a scalable manner.</p>
                 <p>It also offers a complete and secure Enterprise Mobility Management (EMM/MDM) solution that aims to
                    address mobile computing challenges faced by enterprises today. Supporting iOS, Android, and Windows
                    devices, it helps organizations deal with both Corporate Owned, Personally Enabled (COPE) and
                    employee-owned devices with the Bring Your Own Device (BYOD) concept.</p>
-                <p>WSO2 IoT Server comes with advanced analytics, enabling users to analyze speed, proximity, and
+                <p>Entgra IoT Server comes with advanced analytics, enabling users to analyze speed, proximity, and
                    geo-fencing information of devices including details of those in motion and stationary state.</p>
                 <h3>Privacy Policy</h3>
-                <p>This policy describes how WSO2 IoT Server 3.3.0 captures your personal information, the purposes of
+                <p>This policy describes how Entgra IoT Server 3.4.0 captures your personal information, the purposes of
                    collection, and information about the retention of your personal information.
                 <p>Please note that this policy is for reference only, and is applicable for the software as a product.
-                   WSO2 Inc. and its developers have no access to the information held within WSO2 IoT Server
-                   3.3.0.Please see the Disclaimer section for more information. Entities, organisations or individuals
-                   controlling the use and administration of WSO2 IoT Server 3.3.0 should create their own privacy
+                   Entgra and its developers have no access to the information held within Entgra IoT Server
+                   3.4.0.Please see the Disclaimer section for more information. Entities, organisations or individuals
+                   controlling the use and administration of Entgra IoT Server 3.4.0 should create their own privacy
                    policies setting out the manner in which data is controlled or processed by the respective entity,
                    organisation or individual.
                 <h3>What is personal information?</h3>
-                <p>WSO2 IoT Server 3.3.0 considers anything related to you and by which you may be identified as your
+                <p>Entgra IoT Server 3.4.0 considers anything related to you and by which you may be identified as your
                    personal information.</p>
-                <p><b>Signing in to WSO2 IoT Server 3.3.0</b></p>
+                <p><b>Signing in to Entgra IoT Server 3.4.0</b></p>
                 <ol>
                     <li>Your user name (except in cases where the user name created by your employer is under
                         contract)
@@ -55,7 +55,7 @@
                     <li>IP address used to log in</li>
                     <li>Email address</li>
                 </ol>
-                <p><b>Enrolling a device with WSO2 IoT Server 3.3.0</b></p>
+                <p><b>Enrolling a device with Entgra IoT Server 3.4.0</b></p>
                 <ul>
                     <li>Your device ID (e.g., phone or tablet), mobile number, IMEI number, and IMSI number</li>
                     <li>Your device’s location</li>
@@ -64,7 +64,7 @@
                         memory usage
                     </li>
                 </ul>
-                <p>However, WSO2 IoT Server 3.3.0 also collects the following information that is not considered
+                <p>However, Entgra IoT Server 3.4.0 also collects the following information that is not considered
                    personal information, but is used only for <b>statistical</b> purposes. The reason for this is that
                    this information can not be used to track you.
                 <ul>
@@ -74,17 +74,17 @@
                     <li>Operating system and generic browser information</li>
                 </ul>
                 <h3>Collection of personal information</h3>
-                <p>WSO2 IoT Server 3.3.0 collects your information only to serve your access requirements. For example:
+                <p>Entgra IoT Server 3.4.0 collects your information only to serve your access requirements. For example:
                 <ul>
-                    <li>WSO2 IoT Server 3.3.0 uses your IP address to detect any suspicious login attempts to your
+                    <li>Entgra IoT Server 3.4.0 uses your IP address to detect any suspicious login attempts to your
                         account.
-                    <li>WSO2 IoT Server 3.3.0 uses attributes like your first name, last name, etc., to provide a rich
+                    <li>Entgra IoT Server 3.4.0 uses attributes like your first name, last name, etc., to provide a rich
                         and personalized user experience.
-                    <li>WSO2 IoT Server 3.3.0 uses your security questions and answers only to allow account recovery.
+                    <li>Entgra IoT Server 3.4.0 uses your security questions and answers only to allow account recovery.
                     </li>
                 </ul>
                 <h4><u>Tracking Technologies</u></h4>
-                <p>WSO2 IoT Server 3.3.0 collects your information by:</p>
+                <p>Entgra IoT Server 3.4.0 collects your information by:</p>
                 <ul>
                     <li>Collecting information from the user profile page where you enter your personal data.</li>
                     <li>Tracking your IP address with HTTP request, HTTP headers, and TCP/IP.</li>
@@ -95,15 +95,15 @@
                     </li>
                 </ul>
                 <h3>Use of personal information</h3>
-                <p>WSO2 IoT Server 3.3.0 will only use your personal information for the purposes for which it was
+                <p>Entgra IoT Server 3.4.0 will only use your personal information for the purposes for which it was
                    collected (or for a use identified as consistent with that purpose).</p>
-                <p>WSO2 IoT Server 3.3.0 uses your personal information only for the following purposes.</p>
+                <p>Entgra IoT Server 3.4.0 uses your personal information only for the following purposes.</p>
                 <ul>
-                    <li>To provide you with a personalized user experience. WSO2 IoT Server 3.3.0 uses your name and
+                    <li>To provide you with a personalized user experience. Entgra IoT Server 3.4.0 uses your name and
                         uploaded profile pictures for this purpose.
                     </li>
-                    <li>To protect your account from unauthorized access or potential hacking attempts. WSO2 IoT Server
-                        3.3.0 uses HTTP or TCP/IP Headers for this purpose.
+                    <li>To protect your account from unauthorized access or potential hacking attempts. Entgra IoT Server
+                        3.4.0 uses HTTP or TCP/IP Headers for this purpose.
                     </li>
                     <li>
                         <p>This includes:</p>
@@ -113,11 +113,11 @@
                             <li>Cookies</li>
                         </ol>
                     </li>
-                    <li>Derive statistical data for analytical purposes on system performance improvements. WSO2 IoT
-                        Server 3.3.0 will not keep any personal information after statistical calculations. Therefore,
+                    <li>Derive statistical data for analytical purposes on system performance improvements. Entgra IoT
+                        Server 3.4.0 will not keep any personal information after statistical calculations. Therefore,
                         the statistical report has no means of identifying an individual person.
                     </li>
-                    <li>WSO2 IoT Server 3.3.0 may use:</li>
+                    <li>Entgra IoT Server 3.4.0 may use:</li>
                     <li>
                         <ol>
                             <li>IP Address to derive geographic information</li>
@@ -126,28 +126,28 @@
                     </li>
                 </ul>
                 <h3>Disclosure of personal information</h3>
-                <p>WSO2 IoT Server 3.3.0 only discloses personal information to the relevant applications (also known as
-                   “Service Providers”) that are registered with WSO2 IoT Server 3.3.0. These applications are
+                <p>Entgra IoT Server 3.4.0 only discloses personal information to the relevant applications (also known as
+                   “Service Providers”) that are registered with Entgra IoT Server 3.4.0. These applications are
                    registered by the identity administrator of your entity or organization. Personal information is
                    disclosed only for the purposes for which it was collected (or for a use identified as consistent
                    with that purpose) as controlled by such Service Providers, unless you have consented otherwise or
                    where it is required by law.</p>
                 <h4>Legal process</h4>
-                <p>Please note that the organisation, entity or individual running WSO2 IoT Server 3.3.0 may be
+                <p>Please note that the organisation, entity or individual running Entgra IoT Server 3.4.0 may be
                    compelled to disclose your personal information with or without your consent when it is required by
                    law following due and lawful process.</p>
                 <h3>Storage of personal information</h3>
                 <h4><u>Where your personal information is stored</u></h4>
-                <p>WSO2 IoT Server 3.3.0 stores your personal information in secured databases. WSO2 IoT Server 3.3.0
+                <p>Entgra IoT Server 3.4.0 stores your personal information in secured databases. Entgra IoT Server 3.4.0
                    exercises proper industry accepted security measures to protect the database where your personal
-                   information is held.WSO2 IoT Server 3.3.0 as a product does not transfer or share your data with any
+                   information is held.Entgra IoT Server 3.4.0 as a product does not transfer or share your data with any
                    third parties or locations.</p>
-                <p>WSO2 IoT Server 3.3.0 may use encryption to keep your personal data with an added level of
+                <p>Entgra IoT Server 3.4.0 may use encryption to keep your personal data with an added level of
                    security.</p>
                 <h4><u>How long your personal information is retained</u></h4>
-                <p>WSO2 IoT Server 3.3.0 retains your personal data as long as you are an active user of our system. You
+                <p>Entgra IoT Server 3.4.0 retains your personal data as long as you are an active user of our system. You
                    can update your personal data at any time using the given self-care user portals.</p>
-                <p>WSO2 IoT Server 3.3.0 may keep hashed secrets to provide you with an added level of security. This
+                <p>Entgra IoT Server 3.4.0 may keep hashed secrets to provide you with an added level of security. This
                    includes:</p>
                 <ul>
                     <li>Current password</li>
@@ -157,36 +157,36 @@
                 <p>You can request the administrator to delete your account. The administrator is the administrator of
                    the tenant you are registered under, or the super-administrator if you do not use the tenant
                    feature.</p>
-                <p>Additionally, you can request to anonymize all traces of your activities that WSO2 IoT Server 3.3.0
+                <p>Additionally, you can request to anonymize all traces of your activities that Entgra IoT Server 3.4.0
                    may have retained in logs, databases or analytical storage.</p>
                 <h3>More information</h3>
                 <h4><u>Changes to this policy</u></h4>
-                <p>Upgraded versions of WSO2 IoT Server 3.3.0 may contain changes to this policy. Revisions to this
+                <p>Upgraded versions of Entgra IoT Server 3.4.0 may contain changes to this policy. Revisions to this
                    policy will be packaged within such upgrades and would only apply to users who choose to use upgraded
                    versions.</p>
                 <h4><u>Your choices</u></h4>
-                <p>If you are already have an user account within WSO2 IoT Server 3.3.0 ; you have the right to
+                <p>If you are already have an user account within Entgra IoT Server 3.4.0 ; you have the right to
                    deactivate your account if you find that this privacy policy is unacceptable to you.</p>
                 <p>If you do not have an account and you do not agree with our privacy policy, you can chose not to
                    create one.</p>
                 <h4><u>Contact us</u></h4>
-                <p>Please contact WSO2 if you have any question or concerns regarding this privacy policy.</p>
-                <p><a href="https://wso2.com/contact/">https://wso2.com/contact/</a></p>
+                <p>Please contact Entgra if you have any question or concerns regarding this privacy policy.</p>
+                <p><a href="https://entgra.io/contact/">https://entgra.io.com/contact/</a></p>
                 <h3>Disclaimer</h3>
-                <p>WSO2, its employees, partners, and affiliates do not have access to and do not require, store,
-                   process or control any of the data, including personal data contained in WSO2 IoT Server 3.3.0. All
-                   data, including personal data is controlled and processed by the entity or individual running WSO2
-                   IoT Server 3.3.0. WSO2, its employees partners and affiliates are not a data processor or a data
-                   controller within the meaning of any data privacy regulations. WSO2 does not provide any warranties
+                <p>Entgra, its employees, partners, and affiliates do not have access to and do not require, store,
+                   process or control any of the data, including personal data contained in Entgra IoT Server 3.4.0. All
+                   data, including personal data is controlled and processed by the entity or individual running Entgra
+                   IoT Server 3.4.0. Entgra, its employees partners and affiliates are not a data processor or a data
+                   controller within the meaning of any data privacy regulations. Entgra does not provide any warranties
                    or undertake any responsibility or liability in connection with the lawfulness or the manner and
-                   purposes for which WSO2 IoT Server 3.3.0 is used by such entities or persons.</p>
-                <p>This privacy policy is for the informational purposes of the entity or persons running WSO2 IoT
-                   Server 3.3.0 and sets out the processes and functionality contained within WSO2 IoT Server 3.3.0
-                   regarding personal data protection. It is the responsibility of entities and persons running WSO2 IoT
-                   Server 3.3.0 to create and administer its own rules and processes governing users’ personal data,
+                   purposes for which Entgra IoT Server 3.4.0 is used by such entities or persons.</p>
+                <p>This privacy policy is for the informational purposes of the entity or persons running Entgra IoT
+                   Server 3.4.0 and sets out the processes and functionality contained within Entgra IoT Server 3.4.0
+                   regarding personal data protection. It is the responsibility of entities and persons running Entgra IoT
+                   Server 3.4.0 to create and administer its own rules and processes governing users’ personal data,
                    Please note that the creation of such rules and processes may change the use, storage and disclosure
-                   policies contained herein. Therefore users should consult the entity or persons running WSO2 IoT
-                   Server 3.3.0 for its own privacy policy for details governing users’ personal data.</p>
+                   policies contained herein. Therefore users should consult the entity or persons running Entgra IoT
+                   Server 3.4.0 for its own privacy policy for details governing users’ personal data.</p>
             </div>
         </div>
     </div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/register.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/register.hbs
index bcfa99eb090..98ee528e409 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/register.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/register.hbs
@@ -7,7 +7,7 @@
 
         <p class="page-sub-title">Register</p>
 
-        <p>Create a new account in WSO2 IoT Server(All fields are required.)</p>
+        <p>Create a new account in Entgra IoT Server(All fields are required.)</p>
         <hr/>
         <!-- validation -->
         <div class="wr-validation-summary hidden alert alert-danger">
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.footer/footer.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.footer/footer.hbs
index 5dc662d3dbb..7f3d6cd067f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.footer/footer.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.footer/footer.hbs
@@ -17,8 +17,8 @@
 }}
 {{#zone "footer"}}
     <p>
-        <span class="hidden-xs">WSO2 IoT Server{{#unless isCloud}} 3.3.1{{/unless}}</span>
-        <span class="visible-xs-inline">WSO2 IoT Server{{#unless isCloud}} 3.3.1{{/unless}}</span> | &copy; <script>document.write(new Date().getFullYear());</script>,
-        <a href="http://wso2.com/" target="_blank"><i class="icon fw fw-wso2"></i> Inc</a>. All Rights Reserved.
+        <span class="hidden-xs">Entgra IoT Server{{#unless isCloud}} 3.4.0{{/unless}}</span>
+        <span class="visible-xs-inline">Entgra IoT Server{{#unless isCloud}} 3.4.0{{/unless}}</span> | &copy; <script>document.write(new Date().getFullYear());</script>,
+        <a href="https://www.entgra.io/" target="_blank">Entgra</a>. All Rights Reserved.
     </p>
 {{/zone}}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
index 86d24e82586..10ceee4af0d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
@@ -895,7 +895,7 @@ header .fw-user:before{
     padding: 0 8px;
     line-height: 50px;
     font-size: 18px;
-    background: #F47415;
+    background: #ff5000;
     color: #ffffff;
 }
 
@@ -905,7 +905,7 @@ header .fw-user:before{
 }
 
 .navbar-menu-toggle[aria-expanded=true] {
-    background: #D56613;
+    background: #ff5000;
 }
 
 .navbar-toggle {
@@ -967,7 +967,7 @@ header .fw-user:before{
 }
 
 .navbar-collapse.dropdown {
-    background: #132D45;
+    background: #5e6165 !important;
     margin-right: -10px;
     margin-left: -10px;
     padding-bottom: 0;
@@ -999,7 +999,7 @@ header .fw-user:before{
     width: 150px;
     height: 120px;
     padding: 15px;
-    background: #11375B;
+    background: #2f6292 !important;
     display: block;
     overflow: hidden;
     line-height: 1.4em;
@@ -1317,7 +1317,7 @@ footer {
     min-height: 40px;
     overflow: hidden;
     color: #cbcbcb;
-    background: #222;
+    background: #008ba6 !important;
     z-index: 1000;
 }
 
@@ -3686,7 +3686,7 @@ a.btn-operations {
     font-weight: normal;
     font-size: 13px;
     color: #fff;
-    background: #11375B;
+    background: #2f6292;
     padding: 5px 20px;
     display: inline-block;
     margin-right: 2px;
@@ -4044,7 +4044,7 @@ a.wr-side-panel-toggle-btn.selected {
 
 /* stats */
 .wr-stats-board-tile {
-    background: #393939;
+    background: #0c3b42;
     color: #fff;
     padding: 15px;
     height: 110px;
@@ -6264,7 +6264,7 @@ body.inverse .fade-edge:after {
 .thumbnail.icon {
     border: none;
     margin: 0;
-    background: #11375B;
+    background: #638bb1 !important;
     color: #fff;
     text-align: center;
     position: relative;
@@ -6948,7 +6948,7 @@ select > option:hover {
  */
 
 header.header-default {
-    background: #181e22 !important;
+    background: #008ba6 !important;
     height: 50px;
 }
 
@@ -7013,3 +7013,14 @@ header.header-default {
     color: #333 !important;
 }
 
+header .brand h1 {
+    font-size: 15px !important;
+}
+
+header .brand img.logo {
+    height: 30px !important;
+}
+
+try-device-image {
+    background: #638bb1 !important;
+}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.title/title.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.title/title.hbs
index f3f413e9623..5fbe77d3850 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.title/title.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.title/title.hbs
@@ -17,9 +17,5 @@
 }}
 
 {{#zone "title"}}
-    {{#if isCloud}}
-        {{@unit.params.pageTitle}} | WSO2 Device Cloud
-    {{else}}
-        {{@unit.params.pageTitle}} | {{@app.conf.appName}}
-    {{/if}}
+    {{@unit.params.pageTitle}} | {{@app.conf.appName}}
 {{/zone}}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/public/img/favicon.png b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/public/img/favicon.png
index a1deab3581b3fc53b7177d653228cda8d079bc3f..04259f54e86063a84faad7f6226ca878b64e5a79 100644
GIT binary patch
literal 5143
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

literal 1923
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

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.footer/footer.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.footer/footer.hbs
index f981d80ffc7..627c2ddcf06 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.footer/footer.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.footer/footer.hbs
@@ -17,8 +17,8 @@
 }}
 {{#zone "footer"}}
     <p>
-        <span class="hidden-xs">WSO2 IoT Server 3.3.1</span>
-        <span class="visible-xs-inline">WSO2 IoT Server 3.3.1</span> | © <script>document.write(new Date().getFullYear());</script>,
+        <span class="hidden-xs">Entgra IoT Server 3.3.1</span>
+        <span class="visible-xs-inline">Entgra IoT Server 3.3.1</span> | © <script>document.write(new Date().getFullYear());</script>,
         <a href="http://wso2.com/" target="_blank"><i class="icon fw fw-wso2"></i> Inc</a>. All Rights Reserved.
     </p>
 {{/zone}}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/logo.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/logo.hbs
index f23c2c8d866..4ce5f300d4b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/logo.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/logo.hbs
@@ -17,7 +17,7 @@
 }}
 {{#zone "brand"}}
     <a href="{{#defineZone "productUri"}}{{@app.context}}/{{/defineZone}}">
-        <img src="{{@unit.publicUri}}/img/logo-inverse.svg" alt="{{defineZone "productName"}}"
+        <img src="{{@unit.publicUri}}/img/logo.png" alt="{{defineZone "productName"}}"
              title="{{defineZone "productName"}}" class="logo" />
         <h1>
             <span class="hidden-xs">{{#defineZone "productName"}}Unified UI Template App{{/defineZone}}</span>

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/public/img/logo.png b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/public/img/logo.png
index 8fc1947a6abc32a7fdcfade791a077aa25b55c87..d763305ca3dbb478f9615afb7bd201463f3600e7 100644
GIT binary patch
literal 4200
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

literal 3112
zcmaJ@c|4SB8=m86Y)O`^VT@gw4Z}>vHe(Po*5cS|Hq61ym>Fhlk@`YeOJq5;$Wn+Y
z9T9UTMIw%f63RJ!rNgl=rH;PQsm}Mu*Z2P3_kEV%bzS#;Klk;=lj%itk(bq!1pol@
zZmu{V@rV(B>e4{*-|hR=DDj}dbq?VAGQ+q$5}O8aq%z4gkXtk<oaRF#QR8EJXtn^r
z_h7nT05^c(fu=B{A*3w~gdfckvjG5Gdp?UqiKKBsWLh|#fdS9A3Be#b6$AFSBESeN
zEG>fWn!u*{CJ_B736T^O6>M(@vgM=20?{-s3B-?%VsOxW4EU2ST0Gy{hJrz#Alyg{
z`0u0w2wos8lT8CzK`hKEFgP59L_*+}R!Ag#F9-pHBcL$xi!_H@qOFi<gf-~%0~SYP
zQ^U|cIQ-{W;uQuQ!R4~hP$-YbgYYaMOm;XFjzXcfG!O`LF~Xb^&)|~y<_wPh7X=)R
zLt)cdTso5h+EOHunXz09Se)tKB}B8n$}%{gk4b!BP(FzTg+pLlC4B)B2>%}%9sL!}
z;rh`2$@hN>bNu32G^h`a!;EE9#ElEn-wMS-W7#wkm&x{HGNZnnqE`fy%j85bSs<)0
z5@g~}XHc0uj_D^nfq-^naJVD}h31CCfW-<BI-QD!JHedsa3>pUXDl2Jceb>FBd|CW
z0*A#qSvw;goxgB#OiFAtjluoGrT)W3eUrOog=m&IGLFWk$I+;GHZvOZsbn<$+qodW
zsrQ*n{dO+a-{eBY$w0Rn`(KUzvL$xU*7U1w#fz`Tr!mBCXNzt9+u|;306@CT4d>{`
z9~%!yWcfYT-kfWH?}~itus!d*M5cp-bZ(7`jANPvQqjceY7RvgYnpS@Cc+}i{CAJD
zBNr*Uf!w5DeR?D7fcxr|Jm6rJ##A3r!O8f=2p!v{NovLV8jsQOQ^T`~ogeFjPnm0T
z?XSx@9nas_y$UKS1%eK|P+lP&?%6qRP@@>!@gTss+eK1a0-I-kf0vD9c3KK{2z;<n
zO`6-e?1#CLHTwkBC9Nv+iail2X*6nQSfe_tIy@zp(eGxz^FvnYZr3i^az&5bcW>|6
zmMFPL5|vgVJ*hUUoOC~YrZ$7`HkHVfL*79MNwLUW=OC<6gC(_RRWcx-wr24{ThwVe
zejZ2vVB0ees@b_){qP45k$;9z9yS*!(iHJUGigPVJh=}B+Ec;yN-7RRx=jg*TK@_j
zE<IuvP=5rcxkFU<bldeQ*!C1H%faybKYfSc0khmL!@35%fqZXR=5nmUiIwiO{YM{-
z+lm~Io;_R_)OdW9mPSZxFj!WVS*kr}t7NBdqBg5`d>cpdn(WlQ1>R==f!3Se?%EQJ
zq~=|-SpGczxWauzh&k)l?i$8I=T6-ciwD_xCi?7`@-`>^fAJP*2JY`#zqO{>Z+~73
z=o;7)l2wYkNd6-(R83CyOqTlv2~lIQgW)EAL9L6I+g??bqLu%vEO%`#wy#B(6+gTY
z>6ev0nXGhS!n1RwSv2+VIOGX;?3X=Oz`7fehxzFu**JZ_)xA#4kLrcbkqg)~DWLMu
z`L&sC7LvYavf9%}knie|HHPZd!3n0FctcG!H|q}ruDx|PTZ63I<`S#01Lb)To{sPS
zQ@baQE^PYWQ<xw-Ld%F!M9X(g*P7JYA``t5O##)2TkfGT)%sk%oRgHb%e$Jl9Sm6I
zj7B6rORl?ndQ_5-HJ~aYiy9><LgM8l0~>?sm+1Y9Z{WwBlSwUwjMU}+=F>C2j5BT5
z>()5Z+I;y!qk#z>^%7d{M2tYHn4$fHj+7bk{rQ=ah)055mv(MWufw1tSBk5<`7cu|
zv1w*qX@VCSEirN$rN)v2vUU_8^rTjG8XKj2z!3Xd!2`0Vc$m@L`-6?N`99s8pt(~W
zS0DKN_;%JC2N~&PCz520i?G;`AoXX&jfI6ey|<GOL!*jjdOI=#f)pF`Uaj64;_OJ6
zkQ($sMZ+pZmCMl9@R;EC_Vm%m+-Jh&^`(|~s?tWjrU!0UKj=SJmZ&jr4_yo*BXtHP
zN_A5o*Y0*99|}O1=IDjUfgb)Oky}@n8T<Uo8%G;5$<0x-P^P4<v*ybDvEJwmW7om8
z(iYJAm=+Pgp6@>27fy5|;5TfQJuUZj8^LIUNF^`9nUNp|1prq6%JKbei*K*ZzPPUT
z1b{Js1nDhq2%fSNZaj^cVVU$vw?ac4+75LbGfL7^&MrFk_Rl89cu-!>pa#&0ih@~N
zZwtzChj4#<!h@s=MoYZ~&06*;Lg$q*wQ|2g46Rbg7IKvH4+>6|`cU!9lRmBWV4vQ^
zbb9n-Zo$%I_Fimz-TLB^r;*t%GocEf)N=5L@1C#yYRn|!8>=xFHTYA?%F8!bFL2$J
z_y2rT`hqGKxVO&4V_rd1W_4aAA?Bi0#$Od{zp168^@yoba=zYWrDpQws;m8;#VM1t
zETP^x-TI*>L6P|@^C*Y0OW)J$Yij=eu`is*UW)H4(M4n$Dy>e&h<=ZI_vprJOaHOi
z`?U{T^uu$3tBZys!yn**p5?#+uUzdR($Jj(Maau=l%n)GWbNtODju41cYlrxRiQ*a
z5hO{5<rH*OFKkSs{mHi<h}u8qkJ#&Yj(H-ka3@3w=zMvPB&mZvJ=H#r%lwo*J@N*6
zL88KDU@Il}<wdevl<ukQv{Pz*anK*NA)=_7tR1Ddl0N)47bi3lT3~=3=>B6%>ka2`
zN0@}=u)))EcUtC*_H~`}z4$r<w&%<r%H=*!Lp&QVgmAqdpRw;jEUUVE)(s;<@v=zi
zFuDFNOZ0w3vBK%cgc!%G_>zL%N0)MT%#4*Ps@rLI<ixF<q(w_lMVyLg8k@+U>H3qr
z_`ce`aDK+grVX&c-xsyd6%qP}dcVGMzTLg!aTs%cCLtO8wC5E?r#IL+SmM22TjK$@
zNnJ3t`<LypU=^?G%e)&aBvyZlN~^JQAhWII`r@q}t|3weqU>Jw)IDc?802w!>YEdh
zM^M9U<L^b1k%UX>$%Pr*RFUr42@ly!s=d47w9MiI89{xBs7h~h`j%!Z+#~0#OLJBk
zehu(CTTAUuGqt^7PZOCJDNMF%uMpgAq|;gV2Que&*lbtJ5*WWYM^-Bf6Ai5l2bgA{
zR<$igCXkkj#Sk4O#B{6i>AX2okJ-f&);@IaT2k$~yKuWg<+D;FV_Jhzyx{Oqo477`
z^qXA|ixY@6ezG6wWV!z3w(A-POL2sNN7<$)PFDe^?C7u3U@ilxGjsBfUW{KYxUkf#
z;JWu<ffOT5-7GhfYoNy|?CGtzdw@(+m}o&ej$h5TC0A5!Oho#6;0eDkv+4R*`vPN1
z^6Ib2uB{7^Mn%~p%VByxJg=NWL3YEbzed(}q{npbosRz*AF^TV$zpcZUsL&jSboU6
zbih#K4L~bDkZ6-vMnbv9b=dVC*(|LqLPbUS9qI^SRSKW4JZaDxx>wt*J8D}jr|mnZ
znPy5O26%+8*_iiLu9m+*iR_ii*2=>x7A2oeZH^|-u+QZ8R92NVI0a_sYaSc1870Qe
zdW6^UoMpBz@bZtjJOOVG!m~nueJJ39stj{dn3(rR4>g%?jCWEW5rYW@ZRJ`o?X8ZG
z8<lQiF6bV@>F7`Szs(k%-b^`rb{4vMS6Jp`tA?W(FVXbdPbRm^UfL@{o~Xc^bUf?u
ssO(0N%ERuX;-NRMd1n`_+e>T*0Bl|ZOP<M)x9;w4&O}^;)8VxL01AIZE&u=k

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css
index 8ed9f3dce82..e1a6f2a7ad3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css
@@ -7175,7 +7175,7 @@ body.inverse .fade-edge:after {
 }
 
 .navbar-collapse.dropdown {
-  background: #132D45;
+  background: #5e6165;
   margin-right: -10px;
   margin-left: -10px;
   padding-bottom: 0;
@@ -7207,7 +7207,7 @@ body.inverse .fade-edge:after {
   width: 150px;
   height: 120px;
   padding: 15px;
-  background: #11375B;
+  background: #2f6292;
   display: block;
   overflow: hidden;
   line-height: 1.4em;