diff --git a/contribute/style-guides/frontend.md b/contribute/style-guides/frontend.md
index d1b553ecc2e..c73cce4e09a 100644
--- a/contribute/style-guides/frontend.md
+++ b/contribute/style-guides/frontend.md
@@ -7,31 +7,238 @@ Generally we follow the Airbnb [React Style Guide](https://github.com/airbnb/jav
 - [Frontend Style Guide](#frontend-style-guide)
   - [Table of Contents](#table-of-contents)
   - [Basic rules](#basic-rules)
-  - [Organization](#organization)
-  - [Props](#props)
+  - [Naming conventions](#naming-conventions)
+  - [Files and directories naming conventions](#files-and-directories-naming-conventions)
+  - [Code organization](#code-organization)
+    - [Exports](#exports)
+  - [Comments](#comments)
+  - [React](#react)
+    - [Props](#props)
   - [State management](#state-management)
 
 ## Basic rules
 
 - Try to keep files small and focused.
 - Break large components up into sub-components.
+- Use spaces for indentation.
 
-## Organization
+### Naming conventions
 
-- Components and types that needs to be used by external plugins needs to go into @grafana/ui
-- Components should get their own folder under features/xxx/components
-  - Sub components can live in that component folders, so small component do not need their own folder
-  - Place test next to their component file (same dir)
-  - Component sass should live in the same folder as component code
-- State logic & domain models should live in features/xxx/state
-- Containers (pages) can live in feature root features/xxx
-  - up for debate?
+#### Use `PascalCase` for:
 
-## Props
+##### Typescript class names
 
-- Name callback props and handlers with an "on" prefix.
+```typescript
+// bad
+class dataLink {
+  //...
+}
+
+// good
+class DataLink {
+  //...
+}
+```
+
+##### Types and interfaces
+
+```
+// bad
+interface buttonProps {
+  //...
+}
+// bad
+interface button_props {
+  //...
+}
+// bad
+interface IButtonProps {
+  //...
+}
+
+// good
+interface ButtonProps {
+  //...
+}
+
+// bad
+type requestInfo = ...
+// bad
+type request_info = ...
+
+// good
+type RequestInfo = ...
+```
+
+##### Enums
+
+```
+// bad
+enum buttonVariant {
+ //...
+}
+
+// good
+enum ButtonVariant {
+ //...
+}
+```
+
+#### Use `camelCase` for:
+
+##### Functions
+
+```typescript
+// bad
+const CalculatePercentage = () => { ... }
+// bad
+const calculate_percentage = () => { ... }
+
+// good
+const calculatePercentage = () => { ... }
+```
+
+##### Methods
+
+```typescript
+class DateCalculator {
+  // bad
+  CalculateTimeRange () {...}
+}
+class DateCalculator {
+  // bad
+  calculate_timee_range () {...}
+}
+
+class DateCalculator {
+  // good
+  calculateTimeRange () {...}
+}
+```
+
+##### Variables
+
+```typescript
+// bad
+const QueryTargets = [];
+// bad
+const query_targets = [];
+
+// good
+const queryTargets = [];
+```
+
+##### React state and properties
+
+```typescript
+interface ModalState {
+  // bad
+  IsActive: boolean;
+  // bad
+  is_active: boolean;
+
+  // good
+  isActive: boolean;
+}
+```
+
+##### Emotion class names
+
+```typescript
+const getStyles  = = () => ({
+  // bad
+  ElementWraper: css`...`,
+  // bad
+  ["element-wrapper"]: css`...`,
+
+  // good
+  elementWrapper: css`...`,
+});
+```
+
+#### Use `ALL_CAPS` for constants.
+
+```typescript
+// bad
+const constantValue = "This string won't change";
+// bad
+const constant_value = "This string won't change";
+
+// good
+const CONSTANT_VALUE = "This string won't change";
+```
+
+#### Use [BEM](http://getbem.com/) convention for SASS styles.
+
+_SASS styles are deprecated. Please migrate to Emotion whenever you need to modify SASS styles._
+
+### File and directory naming conventions
+
+Name files according to the primary export:
+
+- When the primary export is a class or React component, use PascalCase.
+- When the primary export is a function, use camelCase.
+
+For files exporting multiple utility functions, use the name that describes the responsibility of grouped utilities. For example, a file exporting math utilities should be named `math.ts`.
+
+- Use `constants.ts` for files exporting constants.
+- Use `actions.ts` for files exporting Redux actions.
+- Use `reducers.ts` Redux reducers.
+- Use `*.test.ts(x)` for test files.
+
+### Code organization
+
+Organize your code in a directory that encloses feature code:
+
+- Put Redux state and domain logic code in `state` directory (i.e. `features/my-feature/state/actions.ts`).
+- Put React components in `components` directory (i.e. `features/my-feature/components/ButtonPeopleDreamOf.tsx`).
+- Put test files next to the test subject.
+- Put containers (pages) in feature root (i.e. `features/my-feature/DashboardPage.tsx`).
+- Subcomponents can live in the component folders. Small component do not need their own folder.
+- Component SASS styles should live in the same folder as component code.
+
+For code that needs to be used by external plugin:
+
+- Put components and types in `@grafana/ui`.
+- Put data models and data utilities in `@grafana/data`.
+- Put runtime services interfaces in `@grafana/runtime`.
+
+#### Exports
+
+- Use named exports for all code you want to export from a file.
+- Use declaration exports (i.e. `export const foo = ...`).
+- Export only the code that is meant to be used outside the module.
+
+### Comments
+
+- Use [TSDoc](https://github.com/microsoft/tsdoc) comments to document your code.
+- Use [react-docgen](https://github.com/reactjs/react-docgen) comments (`/** ... */`) for props documentation.
+- Use inline comments for comments inside functions, classes etc.
+
+### Linting
+
+Linting is performed using [@grafana/eslint-config](https://github.com/grafana/eslint-config-grafana).
+
+## React
+
+Use the following conventions when implementing React components:
+
+### Props
+
+##### Name callback props and handlers with an "on" prefix.
 
 ```tsx
+// bad
+handleChange = () => {
+
+};
+
+render() {
+  return (
+    <MyComponent changed={this.handleChange} />
+  );
+}
+
 // good
 onChange = () => {
 
@@ -43,46 +250,36 @@ render() {
   );
 }
 
-// bad
-handleChange = () => {
-
-};
-
-render() {
-  return (
-    <MyComponent changed={this.handleChange} />
-  );
-}
 ```
 
-- React Component definitions
+##### React Component definitions
 
 ```jsx
-// good
-export class YourClass extends PureComponent<{},{}> { ... }
-
 // bad
 export class YourClass extends PureComponent { ... }
+
+// good
+export class YourClass extends PureComponent<{},{}> { ... }
 ```
 
-- React Component constructor
+##### React Component constructor
 
 ```typescript
-// good
-constructor(props:Props) {...}
-
 // bad
 constructor(props) {...}
+
+// good
+constructor(props: Props) {...}
 ```
 
-- React Component defaultProps
+##### React Component defaultProps
 
 ```typescript
-// good
-static defaultProps: Partial<Props> = { ... }
-
 // bad
 static defaultProps = { ... }
+
+// good
+static defaultProps: Partial<Props> = { ... }
 ```
 
 ## State management