diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 77b45a8c..dd84ea78 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,24 +1,38 @@
 ---
-name: 🐛 Bug Report
-about: Something isn't working as expected 🤔
-labels: bug
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
 ---
 
-<!-- Thank your for your input! Before you submit your issue, please make sure you followed our checklist and check the appropriate boxes by putting an x in the [ ]: [x] -->
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
 
-### Checklist:
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
 
-- [ ] I am using the latest release
-- [ ] I searched for [existing GitHub issues](https://github.com/openid/AppAuth-Android/issues)
-- [ ] I read the [documentation](https://github.com/openid/AppAuth-Android/blob/master/README.md)
-- [ ] I verified the client configuration matches the information in the identity provider (or I am using dynamic client registration)
-- [ ] I am either using a custom URI scheme or `https` with [App Links](https://developer.android.com/training/app-links) for client redirect.
-- [ ] I can reproduce the issue in the demo app (optional)
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
 
-### Configuration
-- Version: 0.X.Y
-- Integration: (native(Java/Kotlin), Xamarin, ReactNative, etc)
-- Identity provider: (Google, Okta, Gluu, Auth0, KeyCloack, etc)
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
 
-### Issue Description
-<!-- Please include what's happening, expected behavior, and any relevant code samples -->
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md
new file mode 100644
index 00000000..48d5f81f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/custom.md
@@ -0,0 +1,10 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 2777d82e..bbcbbe7d 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,20 +1,20 @@
 ---
-name: 🚀 Feature Request
-about: Share ideas for new features
-labels: enhancement
----
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
 
-<!-- Thank your for your input! Before you submit your issue, please make sure you've searched https://github.com/openid/AppAuth-Android/issues for existing requests -->
+---
 
-### Feature Request
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
-#### Motivation
-<!-- Why should this feature be implemented? What problem does it solve? -->
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
 
-#### Description
-<!-- Describe your feature request in detail -->
-<!-- Please provide any code examples or screenshots of what this feature would look like -->
-<!-- Are there any drawbacks? Will this break anything for existing users? -->
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
 
-#### Alternatives or Workarounds
-<!-- Describe alternatives or workarounds you are currently using -->
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 682e9454..0397cc50 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -1,7 +1,10 @@
 ---
-name: ❓ Ask a Question
+name: "❓ Ask a Question"
 about: Ask the community for help
+title: ''
 labels: question
+assignees: ''
+
 ---
 
 <!-- Thank your for your input! Before you submit your issue, please make sure you've searched https://github.com/openid/AppAuth-Android/issues for existing questions. -->
diff --git a/README.md b/README.md
index 1c283f44..d1d6a321 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-![AppAuth for Android](https://rawgit.com/openid/AppAuth-Android/master/appauth_lockup.svg)
+n[AppAuth for Android](https://rawgit.com/openid/AppAuth-Android/master/appauth_lockup.svg)
 
-[![Download](https://img.shields.io/maven-central/v/net.openid/appauth)](https://search.maven.org/search?q=g:net.openid%20appauth)
+[Download](https://img.shields.io/maven-central/v/net.openid/appauth)](https://search.maven.org/search?q=g:net.openid%20appauth)
 [![Javadocs](http://javadoc.io/badge/net.openid/appauth.svg)](http://javadoc.io/doc/net.openid/appauth)
 [![Build Status](https://github.com/openid/AppAuth-Android/actions/workflows/build.yml/badge.svg)](https://github.com/openid/AppAuth-Android/actions/workflows/build.yml)
 [![codecov.io](https://codecov.io/github/openid/AppAuth-Android/coverage.svg?branch=master)](https://codecov.io/github/openid/AppAuth-Android?branch=master)