diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000..d2eafaf
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @thunderbird/autoconfig-reviewers
diff --git a/.github/workflows/validate-config.yml b/.github/workflows/validate-config.yml
index d41af32..e3f5dcb 100644
--- a/.github/workflows/validate-config.yml
+++ b/.github/workflows/validate-config.yml
@@ -32,3 +32,8 @@ jobs:
         run: |
           pip install lxml
           python tools/validate.py ispdb/*
+
+      - name: Run convert.py
+        run: |
+          mkdir tmp/
+          python tools/convert.py -a -d tmp/ ispdb/*
diff --git a/ispdb/nili.ca.xml b/ispdb/nili.ca.xml
new file mode 100644
index 0000000..c37a369
--- /dev/null
+++ b/ispdb/nili.ca.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<clientConfig version="1.1">
+  <emailProvider id="nili.ca">
+    <domain>nili.ca</domain>
+    <displayName>Nili</displayName>
+    <displayNameShort>Nili</displayNameShort>
+
+    <incomingServer type="imap">
+      <hostname>email.nili.email</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+
+    <incomingServer type="pop3">
+      <hostname>email.nili.email</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
+
+    <outgoingServer type="smtp">
+      <hostname>email.nili.email</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+
+    <outgoingServer type="smtp">
+      <hostname>email.nili.email</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </outgoingServer>
+
+    <documentation url="https://nili.ca/knowledge-base/how-to-connect-email-clients-to-servers/">
+      <descr lang="en">POP, IMAP, and SMTP settings for Nili</descr>
+    </documentation>
+  </emailProvider>
+</clientConfig>
diff --git a/ispdb/office365.com.xml b/ispdb/office365.com.xml
index e37e142..ef0346f 100644
--- a/ispdb/office365.com.xml
+++ b/ispdb/office365.com.xml
@@ -25,6 +25,22 @@
         <leaveMessagesOnServer>true</leaveMessagesOnServer>
       </pop3>
     </incomingServer>
+    <incomingServer type="ews">
+      <username>%EMAILADDRESS</username>
+      <authentication>OAuth2</authentication>
+      <url>https://outlook.office365.com/ews/exchange.asmx</url>
+    </incomingServer>
+    <incomingServer type="owa">
+      <username>%EMAILADDRESS</username>
+      <authentication>OAuth2</authentication>
+      <url>https://outlook.office365.com/owa/</url>
+    </incomingServer>
+    <incomingServer type="graph">
+      <username>%EMAILADDRESS%</username>
+      <authentication>OAuth2</authentication>
+      <url>https://graph.microsoft.com/</url>
+    </incomingServer>
+    <!-- Backwards compatibility with single Exchange incomingServer element. -->
     <incomingServer type="exchange">
       <hostname>outlook.office365.com</hostname>
       <port>443</port>